diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-05 15:31:00 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-05 15:31:00 +0000 |
| commit | 846f6c59759629386e110bf7243b25fdc1651d19 (patch) | |
| tree | ffe0bbf4e3a1fab75f111d479ea4d21f13e02233 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 35419a1f4940b2c785b1f358f8b8b15c070169cc (diff) | |
| parent | 7fad9b65f9f6366ea49e92258b767f03f73484e6 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 08063278bd -s ours am: 1d1de27f54 -s ours" into rvc-d1-dev-plus-aosp am: 7fda4abb9f -s ours am: 7fad9b65f9 -s ours
am skip reason: subject contains skip directive
Change-Id: Iac9595688af7a9c4023dc4534ed1b79ece796031
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions