diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-21 08:09:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-21 08:09:40 +0000 |
| commit | 160348659ec93bc5e382588467b313dcd21e35ea (patch) | |
| tree | dd1b03e58c5de68df18a2ae5b47cf578a7ee33c2 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | ade3cf56b3f0ad1e493e9f78002eee9fba2e6c81 (diff) | |
| parent | 7422e9848bb72fe6bc2a3a31e2be46aab9505b30 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: d94272381a -s ours am: 7422e9848b -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532275
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4f56868e9890c8477d86a7e17e29a84fe700ae02
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions