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