diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-18 08:04:49 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-18 08:04:49 +0000 |
| commit | 2c6359720a526bbb465308242a3fd079aa85d119 (patch) | |
| tree | ac790e097d5d1c43ab2ff44f09a5fa48748c6c51 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | c24a85cc41f1eadc4d8f5f4db3e13103b196ae03 (diff) | |
| parent | d89013984601520b9f209b5c17ccd207a358a1a5 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 851960cdd1 -s ours am: a99806ee78 -s ours am: a14e88120f -s ours am: d890139846 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12184423
Change-Id: I0febedfff2c12adfcf0b308c8d4e29f30e5735ef
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions