diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-06 14:53:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 14:53:34 +0000 |
| commit | daedf41193830eee6868540e1e046ca15990c26b (patch) | |
| tree | b5d9df6968d259c499fe2a907f44a20a61d873e5 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 6a8dc9bc644375f39c2ca0c53a3051cabbbbd969 (diff) | |
| parent | 85d390abbcb296fd9501817992bafb518824e5e5 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: cc4a65b365 -s ours am: e861ab7cb2 -s ours am: b5de0ccd47 -s ours am: 1bfa101792 -s ours am: 85d390abbc -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12086503
Change-Id: Ib1c0bca324a5d81f8fcaeff5ea8e0eb1485a2021
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions