diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-21 09:14:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-21 09:14:51 +0000 |
| commit | deb3de56af27a45e9297800715973bf95026c82d (patch) | |
| tree | 4f1f6787b2aa7e91da793688e61ca956254a6c07 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | b8709b7fc8fb0fd8b6f537a2f1a1ba96e0538150 (diff) | |
| parent | 678ad90f1e45796ff77c445f9b20183c23c43598 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 80feb8df3c -s ours am: 678ad90f1e -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: I5b15e8a86aa0132ab43b78a9e6385c4f68695a46
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions