diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-18 20:13:23 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-18 20:13:23 +0000 |
commit | c2d85b8205f91c585ddef2f2318fe082b4e42c97 (patch) | |
tree | a01dfb63e87e88eb448fb0105df5f72de7193e83 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | ce1b629e581b5644b08f338ffa8be17f1af94e2f (diff) | |
parent | 94f6045361e4c3aa830660c8f7cf63832be36490 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 3c26551d2b -s ours am: 94f6045361 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11916186
Change-Id: I28f3d761eddd6d49dee4063416c290cb2f205a40
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions