diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-10-07 17:51:56 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-07 17:51:56 +0000 |
| commit | 6e4a7a937f681cdc1715df09ba91023862d2615e (patch) | |
| tree | 43338d6ba26e7d2fda40f72d9cc2696931c84b26 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | a2a42892af64d13dcb374950debfb2becd012e08 (diff) | |
| parent | 5ce35c29088cd8e110e830174a24d0f709e87f6d (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b3cbc66070 -s ours am: 9339405d43 -s ours am: 5ce35c2908 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12781701
Change-Id: I9060ab6001d12179a62506994ed5ab759a957251
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions