diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-28 06:43:29 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-28 06:43:29 +0000 |
commit | c6d4c2daad8fd247375a62695b30ce4c6df353ac (patch) | |
tree | ee3804b43bb20a0cbbde63169c77ea906bab2448 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | a3efdb4232b4bfb36d02204a52152f5c9ecc7c68 (diff) | |
parent | 00ec14238713c9fca7809f2611272369bf46dc04 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8d737ec862 -s ours am: 1cfde11022 -s ours am: 94833d6faa -s ours am: 00ec142387 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12014871
Change-Id: Id5d783028066f70051a14c2cc6105e7eb370e6c4
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions