diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-11-24 06:36:03 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-24 06:36:03 +0000 |
commit | a2402d954c550bc2c20973c7a8dc0857bd697aab (patch) | |
tree | 07484accc25bd2cb66c44b17e87f9f8b981c3b94 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 0454f4100874c0c64588d589ae9d15b4cd91e668 (diff) | |
parent | 68b89cbb2653fa441d505a469e47e11e038cca38 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7097a98494 -s ours am: 68b89cbb26 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13115252
Change-Id: Ib6c3e017db2e497ae028da77bc00884206564344
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions