diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-10 21:51:05 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-10 21:51:05 +0000 |
commit | 4877d75f61d979c529bc5d1d7e90781e0aeb6eb1 (patch) | |
tree | bec3772b538a16c921d2f1b05f4d6cbaaf19f32f /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 3cb5d244efa1aad230557eb37c95042dadc25818 (diff) | |
parent | 972c67deceaf357c5e451c73ca2f24010d730d9d (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 37788ab486 -s ours am: 972c67dece -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818446
Change-Id: I61df6e16d94a9e4a0fdf32a1f106dd37aa3e4fb4
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions