diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-06 14:12:45 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-06 14:12:45 +0000 |
commit | 3a1f81ed454e76ebe1b506a54f626e79ca3c06db (patch) | |
tree | b3963b616eb3781c5f8bd4f1cfced083132a3f44 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | f7b50697d50eb7fb2eacfd522e15ffedd9b4abfd (diff) | |
parent | 17e5b6543ed4a58e8eadeae929279f5a0f0c8423 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c4c8e17c99 -s ours am: 17e5b6543e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11761986
Change-Id: I7647e912b3b7004b506b203d620b95586a4e05e6
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions