diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-02 18:18:33 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-02 18:18:33 +0000 |
| commit | b89c6d94c58f65a44b84f0402c9c659da10f01b5 (patch) | |
| tree | 82e1fa40059b27287458ee58f10281ab2364b024 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 424cf3e399c86c766000f2552ca16c1283d26cec (diff) | |
| parent | f59fa9f9bb5ed66e62082fa696a33dfba0e7cd52 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: f59fa9f9bb -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512963
Change-Id: Iec7a26ecd68aca9c7a38cc8f441197a8237b0c8c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions