diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-16 18:48:21 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-16 18:48:21 +0000 |
commit | 77c5047aa654fe95ce61a2f35dce6baeb90dfdf9 (patch) | |
tree | 7c308840df46680a7726f58218f0ed43b7acf5b5 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 28b32a2682e7dc808467b10c15b558e30aa87b46 (diff) | |
parent | 77c24ecc36508c6bbf1bb90e7c2d5dc7ccd50fe7 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: df1bc05463 -s ours am: 77c24ecc36 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11873738
Change-Id: I9dd1295e8b913dfa0866d9b8dd684ef987c03ff7
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions