diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-05 21:43:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-05 21:43:37 +0000 |
| commit | 7425a7fcca85c0f2ae33b27a9d3881f1fcd036f8 (patch) | |
| tree | 49036e1132f5a005f74cc468aee9b83ad90ba435 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | cd5842aa350d3a8c6e2707a14823939ffe9484d6 (diff) | |
| parent | 8c4bb51982cd893d5e6dd8be33005ea5fc5e9f0c (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: f87beda8f2 -s ours am: 8c4bb51982 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12077356
Change-Id: Ifde1668ff8a98317c8f84b83b87da5148d1e1467
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions