diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-18 00:25:34 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-18 00:25:34 +0000 |
commit | 1d1b1c5f15a58219c028cf3b59eee9a1b9436e05 (patch) | |
tree | e310099b1ccae4b9bedea8b836e6030bb97bd1ae /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | ede3ce38710e57723221f6a4b9afee09a0c00ef4 (diff) | |
parent | 64bbb7ca40ff6993150a77d4a0155d32fc7a8e38 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 8858a01373 -s ours am: 64bbb7ca40 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11897530
Change-Id: I53bbcaa00864003eff86d8bfd69061e17cd66317
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions