diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-23 18:10:05 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-23 18:10:05 +0000 |
commit | 7dd6b5bb5ccda5b01b084550a1e35b65b7e6cced (patch) | |
tree | 5c9a79eccf75bf4114202965af78e891dd5f0b00 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 0b8f7b268bbdfbeb570c0982243ae56abb4f1d78 (diff) | |
parent | be8cba0facf9944fe2b06c839bff7f89eda1c9dc (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: dffcd5fe7a -s ours am: be8cba0fac -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11961575
Change-Id: I5733c372e617272ae17bfe3ac636ab9d2e6e70a5
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions