diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-04-10 07:16:18 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-10 07:16:18 +0000 |
| commit | d984b05ec7520fb2451e245af1ebfe02a90607f9 (patch) | |
| tree | 666942b9e892bb01ba2e16d850f50642b2222129 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | d942e8c6491a1c013940f93a8c1b778e443b8bed (diff) | |
| parent | 45e9470b7e6166b4db05ed0a23ca2e21b7d18ccf (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 1ec8674378 -s ours am: 45e9470b7e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14146525
Change-Id: Iba3f62ffdb078ec6feb674565367980fdb87e8dd
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions