diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-19 15:28:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-19 15:28:03 +0000 |
| commit | bc1a6c158976f6b4e987be4f5b47b8aa32fe9fa6 (patch) | |
| tree | fd5212ce314d91f45f8ffd5305800846e871e936 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 0cfbde601151edec47b4c78f16ff0348d2aa76d6 (diff) | |
| parent | 670bdd3b7470e56bc21dd70191f3c339177bf635 (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12187283
Change-Id: I0b6dc9eadc8184093b3d44d85e92926c91af80a9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions