diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-18 06:49:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-18 06:49:35 +0000 |
| commit | 135e36a20fe3ddb9e7203c0fd12409fcbaae29b4 (patch) | |
| tree | a82c7f97cfa991ca4eb0b8468776b130069702ad /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 9dcdb248392d4380d598b8a2403902ca892758c1 (diff) | |
| parent | 3e14f4892eac7898d183e683b46eec81be701d80 (diff) | |
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72d3135ecb -s ours am: e4a4b7dbee -s ours" into rvc-d1-dev-plus-aosp am: 3e14f4892e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12184422
Change-Id: I3cdf644a14f9610557ae361b9d1dee897784471f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions