diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-16 18:31:07 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-16 18:31:07 +0000 |
commit | aca62f10a235c1befab077bc6b045f14cf4d97c9 (patch) | |
tree | 7c308840df46680a7726f58218f0ed43b7acf5b5 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 74f91531c8b18275089bf8cc684cc63c3ea8af49 (diff) | |
parent | df1bc05463bc9e1cf844e479ebe6d53ad13f5fe7 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: df1bc05463 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11873738
Change-Id: If7d7f5ef7d2823c9619fff595864e53c017cfd87
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions