diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-05 21:00:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-05 21:00:37 +0000 |
| commit | eec3cdbd5c20e2f49cdfbf160dd661895388fff3 (patch) | |
| tree | fbc04b89468bbacfc5acb8ffe37bac5db0f3a1e7 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 902c3252ec9d454f47b8520ab60f9d96372c42d9 (diff) | |
| parent | f8c9fc05fc468ca632f3064d1342213f864d6398 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 97455bb190 -s ours am: f8c9fc05fc -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12077356
Change-Id: I25ef574ffc21b75565cba9d0372b1855be7962cb
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions