diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-19 19:52:00 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-19 19:52:00 +0000 |
| commit | 1efc890cac24ca545e23efbb226614004202d596 (patch) | |
| tree | 09b5e899e63f98928b1de4da01c063fc335f7996 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | eaca91a0acdb92b364453f57b1c4fa82066063a4 (diff) | |
| parent | 1c285d0e368dbd860cc3faa1ab375d215f3eca8f (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: c294687770 -s ours am: fdd9fab0be -s ours am: a0315ad1a5 -s ours" into rvc-qpr-dev-plus-aosp am: 1c285d0e36 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12188942
Change-Id: I463888a5edbfdd243e9f78f5a4732f031c87fb76
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions