diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-10 21:50:20 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-10 21:50:20 +0000 |
commit | f5854bd63798ae8fd82ce154345ca40442b03f19 (patch) | |
tree | e323bf8c9844d259ec2af71ae7381b1bf5d9c397 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | b05155e34d0b2dc2ebf5a5d04efb1b6fe4410181 (diff) | |
parent | 8c8faf7d20a0ee9e918d69c82f9300d2dd08ce76 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 37788ab486 -s ours am: 8c8faf7d20 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818446
Change-Id: I34eb4e61531a7c6752b4a5b8dc7ee722d96c2278
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions