diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-28 05:51:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-28 05:51:47 +0000 |
| commit | 128fc185abf01e02520b2db9b10828a0f2ccbf84 (patch) | |
| tree | ee3804b43bb20a0cbbde63169c77ea906bab2448 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 79516e9796f4a9a06212acfaadfac13ff26176bd (diff) | |
| parent | 01e6ceb48c9686743aa058b32fdc0e82e6c46dad (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: f8315ae79d -s ours am: 0dd4cceb45 -s ours am: 98d6b2a2d4 -s ours am: 01e6ceb48c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12014870
Change-Id: I81b3fba56a428ba2adcdd38110107b5ec1708478
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions