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