diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-22 00:59:58 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-22 00:59:58 +0000 |
commit | f6e3bc298da8e878c2b80313d8c9c5a67da55f42 (patch) | |
tree | 5ed15011c1a7dd61776706afbf017ebacf156c99 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | ceff8ff8cd156bd36414df82fd9767345a0873a4 (diff) | |
parent | 92e9590e7cfa66b05b0b2226a80ed97651f7d300 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: d381a1af79 -s ours am: 92e9590e7c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12203662
Change-Id: Ie9e86dbdf5246d8884002bb08382ee0c354f68c6
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions