diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-06 14:23:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 14:23:13 +0000 |
| commit | 25b4952da7222e6850f72093309a9924e331ad30 (patch) | |
| tree | 4dc1880b8fa57b28ce990067e0049c0f065dcc8c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 58c18b6fd69313e03ce89d0ba5b3c77aecac5b80 (diff) | |
| parent | 4b4922186a784000846941fb514d1b4d72300388 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: cc4a65b365 -s ours am: e861ab7cb2 -s ours am: 4b4922186a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12086503
Change-Id: I4216c2308bdd1726cbcb31660fef7797ea45c19c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions