diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-21 23:16:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-21 23:16:51 +0000 |
| commit | b1b43ec872c100616386e56e588d5f2070f200d9 (patch) | |
| tree | 18c80e84a75d7c9015aa6ecd8f8db2a8628aff35 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | c9ecc5a0b680d5b5140c4b24c3fd77d80add4686 (diff) | |
| parent | 8b443faacad2fb537b860ce92bea224f4f6027c0 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: d379a76ad4 -s ours am: 903ed6ea78 -s ours" into rvc-qpr-dev-plus-aosp am: 8b443faaca -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12423850
Change-Id: Ic95a8487e3d3c47de359e9ee5d672384e48e572b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions