diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-05 21:41:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-05 21:41:43 +0000 |
| commit | 5b9ebc0f95d9072844a72ef3473c97fc6aaf1c6a (patch) | |
| tree | 49036e1132f5a005f74cc468aee9b83ad90ba435 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 7b582ae44f2dff6dab09dd449c07e9c6da6cec4f (diff) | |
| parent | a8b2f1448a101a7c03f3b5246e8a7a2f24a4cfe1 (diff) | |
Merge "[automerger skipped] Import translations. DO NOT MERGE am: 4aa476c0eb -s ours am: 4c3e8bbff9 -s ours am: 262fa1f937 -s ours" into rvc-d1-dev-plus-aosp am: f75e86e3f1 -s ours am: a8b2f1448a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12079851
Change-Id: Iebd41d899a2aee5edf2db283218a2bdfcef17df7
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions