diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-06 13:57:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 13:57:03 +0000 |
| commit | 5bc71ea527ebb85ab27038836360a5f9a9827d51 (patch) | |
| tree | 390faf13c967870400726ca40f68bd4fce327814 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | e8a51880b5ef01cecc1c296dd07aaf3fc50a1292 (diff) | |
| parent | ac0b376ddec13eba351dd668e0964a16a4300900 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: ac0b376dde -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12086502
Change-Id: Ifdbca96a366d72622ce6f515f6e1d426bf680e5a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions