diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-28 05:27:28 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-28 05:27:28 +0000 |
commit | 8ea05523fae473aaeedbb6043eb743b2653ac6dc (patch) | |
tree | 5d5e2a3632f249691a52892daa1d1ca579e8628a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 09e6b782eef3267d34ee75d33271e99805a3fdd8 (diff) | |
parent | 2b757435b95cae634c1e64554b74af11a4794bec (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: f8315ae79d -s ours am: 2b757435b9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12014870
Change-Id: I35c8e0b3e10ac014560b9f7e324e5d94bc7530b0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions