diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-18 18:13:01 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-18 18:13:01 +0000 |
commit | 93af0d6a7b615aedfb730818f2bc9b3f117df03a (patch) | |
tree | 8c32c232b85b543196f812ce0714456d5d976817 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 3af9f54f54dcf29cf8c1bccd0230dfdefb6061b7 (diff) | |
parent | 3743d492393cd66f7babcd3b0911edab8a8db6dd (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 776cb394b6 -s ours am: 766a6861ca -s ours am: 3743d49239 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11894373
Change-Id: I8aeb570c9b524e99642a2c8886f26d1ea5d23f2a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions