diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-17 17:27:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-17 17:27:06 +0000 |
| commit | 8d76d134796ee5bb2ac2f21d571d11d318f9d9a4 (patch) | |
| tree | 24f642b5fcf9628c5cd1e2a5fcc9d9bfd00a2eaa /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | f7284675770887cde79b683ba01d9ea974f08562 (diff) | |
| parent | 51322aa3376e2a91803442fda1f9b193779ab1a8 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 11e5fdf1ee -s ours am: 122dda0e61 -s ours" into rvc-qpr-dev-plus-aosp am: 51322aa337 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11888298
Change-Id: I3e6d986ab7f70130ecf04b2aed3780a6195e0d01
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions