diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-22 19:51:27 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-22 19:51:27 +0000 |
| commit | a78ee128182e30099c64933f59d531d711aa2d9b (patch) | |
| tree | 46722e29358f6eb0eb8b41b870086e52cc440409 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | ff696632458e47b6b49e2695324b635930a7c605 (diff) | |
| parent | 80cca06027fe1d4030b630f33fc6ef23a209c2b6 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 80cca06027 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684412
Change-Id: Iabfb45aab57cb25662373e6a26795759abf4f759
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions