diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-18 00:25:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-18 00:25:10 +0000 |
| commit | 44eb11cd710f02e4da97c96723ee249a4e617d1d (patch) | |
| tree | e310099b1ccae4b9bedea8b836e6030bb97bd1ae /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 482a621bf2627548e79e20764698d67f2c18763b (diff) | |
| parent | bc603d40a71a1387004a3dcfaf9d8347e4ff9b36 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 75cb80445b -s ours" into rvc-d1-dev-plus-aosp am: bc603d40a7 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11900658
Change-Id: I68f36946976400eded0fded43936e309659cdc86
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions