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