diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-23 17:10:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-23 17:10:55 +0000 |
| commit | 45900f61e9a77d0362d64980b97f94c77891ba4a (patch) | |
| tree | 6a7eb5783e9358ba75a448b66faa50e246fe4bb2 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | e3a49cda609ae03e9fd9832b8e579d0236c94423 (diff) | |
| parent | 5e0076d2c1c22765240acd44af756111e2005e86 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 24804d2a8f -s ours am: 697892fae3 -s ours am: eb292b5e30 -s ours am: 5e0076d2c1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11969480
Change-Id: I35243a7ac2f1b6a5a969f73703ba4c8e5e1fb5f1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions