diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-04-10 04:33:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-10 04:33:40 +0000 |
| commit | 3793f3ca23783b2d82806c22f79b106470d5f776 (patch) | |
| tree | fcea5dcf1899ed6e1f93de9ceb1c78e01a61bff2 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | bd8e63545b73ee36449fea76b979795778e97775 (diff) | |
| parent | 918aeb2e71fb008e34a9ade8968f5bea31f25a75 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 918aeb2e71 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14146126
Change-Id: I1066ff25ccd377f64f6351b24cf1c306fb8a2cc4
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions