diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-04-21 20:55:11 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-21 20:55:11 +0000 |
commit | 037aa8758918b673f977e9fce7b0fa62be3ff13f (patch) | |
tree | 6b1de158b65f8a3444ecd68feca98c6cbb5d33e3 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 62951ca1371b3f36ff379ccff04e322ffa30b8b7 (diff) | |
parent | 58141584ac75821994613eb7a54430fc0a1beec8 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 58141584ac -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14269425
Change-Id: I1f1c1b12c959b2834c66e8054d6c4721dad26bb9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions