diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-19 15:46:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-19 15:46:06 +0000 |
| commit | db12884a81098fe46508fac469d67705b590af50 (patch) | |
| tree | 7f69384acaac3e5b33676fa3a0f5529b3a041e80 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 58dd09c7eabd3f424cc7a7080316c1efdf5ab017 (diff) | |
| parent | bc1a6c158976f6b4e987be4f5b47b8aa32fe9fa6 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: f6d4adeef4 -s ours am: 94ef8f65e4 -s ours am: 670bdd3b74 -s ours am: bc1a6c1589 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12187283
Change-Id: Ic99c66b61b07f81dbf5998844374137289f466fc
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions