diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-05 23:34:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-05 23:34:43 +0000 |
| commit | ee0600f446a209c95e746ea3d68558e7d10afb64 (patch) | |
| tree | 2aa75931e8df4db1b15451a99c866961dabbe82f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 67d840035be7d7d4f9f8f8e75aac6335138f1ccd (diff) | |
| parent | 9a78c292c9902af7bd24e23c2f100ec016fe6ee4 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 80e43d2ed7 -s ours am: 8a9211ecc5 -s ours" into rvc-d1-dev-plus-aosp am: 9a78c292c9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11759020
Change-Id: I8ecc11f4f530a24cc1148a8f6d6255197a26cc0d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions