diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-22 21:22:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-22 21:22:52 +0000 |
| commit | 05957b7ac0e3629f197354c2c4b526089bad82f0 (patch) | |
| tree | 87611a13927dbbd03ed3a6efe9f44700c433b172 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | da19a9eeec5177a3632a0033f5894affb70b65a1 (diff) | |
| parent | ca61a9bcca85bef1db68c53fa6c720d9b770e5d0 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: db44950d25 -s ours am: ca61a9bcca -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684939
Change-Id: Id5b83e9b7fc27ec4ffdd9466918d67e08a21dedf
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions