diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-06 13:58:57 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 13:58:57 +0000 |
| commit | e9ae85a02579a00a191e7238194be1115a3bf968 (patch) | |
| tree | 390faf13c967870400726ca40f68bd4fce327814 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 69c10a41ac4c2e8162ec04c16309e44adb931f5f (diff) | |
| parent | 8adc4f7f3f5cecfe49b260d27c06c5cd4f7ca507 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 8adc4f7f3f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12086570
Change-Id: Iabe61a64c58c4f05fe208972dcecbf56cfabf55f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions