diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-05 06:30:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-05 06:30:29 +0000 |
| commit | 09c7fe9ac835118786c546bbb64a6277c4f60559 (patch) | |
| tree | 49036e1132f5a005f74cc468aee9b83ad90ba435 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 6b94feabddbf10ac59f24d585277319cbbfc0817 (diff) | |
| parent | 8f9ddb86e51039ffa09a7ab41d7b7d0c51dba51a (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: b43c3c0388 -s ours am: 7b55597e03 -s ours" into rvc-qpr-dev-plus-aosp am: 8f9ddb86e5 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12076168
Change-Id: Ifb58b16e904fae22533ab4dba4375fddc376f2f8
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions