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