diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-05 15:25:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-05 15:25:30 +0000 |
| commit | 7fad9b65f9f6366ea49e92258b767f03f73484e6 (patch) | |
| tree | fe4e045e14c60f101e2b78f3747ee8918c10a04b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | fb862dbfb8a0c8e8ff400e0dc0a8e177a97dfc37 (diff) | |
| parent | 7fda4abb9ffccf0e4cbac70441a19d32e14479cb (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 skip reason: subject contains skip directive
Change-Id: I0aee19d1039929bb01f5ffde6118681fa465cfcc
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions