diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-28 02:13:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-28 02:13:54 +0000 |
| commit | 134a338d54efeebcabb331101e47b5eb7119b6f0 (patch) | |
| tree | ee3804b43bb20a0cbbde63169c77ea906bab2448 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | b84698f0bb500a561335471f7ccdd5b6cdec4e2b (diff) | |
| parent | 1597e024080ba31c573976259804bd3cd7f3787b (diff) | |
Merge "[automerger skipped] Import translations. DO NOT MERGE am: d6c5d047f0 -s ours am: 558bbb9f8a -s ours am: 09e6b782ee -s ours" into rvc-qpr-dev-plus-aosp am: 1597e02408 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12023261
Change-Id: Ib7ea72bed625259eb62bb4b28829d246b67d9fda
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions