diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-06 17:03:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 17:03:15 +0000 |
| commit | 22810521eb1681ff50ceec3bbefb627c3d8a50d1 (patch) | |
| tree | 293d0cff0f3cd021249ec8097dbcbeba20a3d5d5 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 837bc8abfc949061f7ae514802ceef3c369da537 (diff) | |
| parent | 75c3356103e97dc1ea30859dbfb82134b24f9dc0 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: c83b93b3f1 -s ours am: 75c3356103 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12087182
Change-Id: Idecbc8c696fd4d2ce2f5f3179efdfe78fef38cd6
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions