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