diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-21 09:15:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-21 09:15:15 +0000 |
| commit | 1bc3c07859599a9f0e9239148f172fb103066f18 (patch) | |
| tree | 4f1f6787b2aa7e91da793688e61ca956254a6c07 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | deb3de56af27a45e9297800715973bf95026c82d (diff) | |
| parent | 7861bbb7e48ff51ac9c44324d00bc157dcff8b86 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 96db3dad2a -s ours am: 7861bbb7e4 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532303
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3a143e336391bae7b64ce9d09fc7f652cf8fa7d9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions