diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-18 18:13:09 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-18 18:13:09 +0000 |
| commit | 41fdb44473c68d7db886cbcba50daad829654814 (patch) | |
| tree | d213048a6d836c4e3e8c5fe686d62059bf45c8b1 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | a6845a1447316f985594737973fc6748d221abc3 (diff) | |
| parent | 7bd2ecf385afabcba4747f3ae61272e9ef22d001 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 776cb394b6 -s ours am: 9c9980a422 -s ours am: 833714e2d1 -s ours am: 7bd2ecf385 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11894373
Change-Id: I890a92d3a4f12c9dd2ba5d4d6073fce9a247ef74
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions