diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-05 21:43:26 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-05 21:43:26 +0000 |
| commit | cd5842aa350d3a8c6e2707a14823939ffe9484d6 (patch) | |
| tree | 49036e1132f5a005f74cc468aee9b83ad90ba435 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 0eba71934849b0021c14378cab4c20d316e8aa3e (diff) | |
| parent | 65cc1e53f9e24b327294e0108d41e0edbda349bb (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: dc862269a7 -s ours am: 9348f97202 -s ours am: 2acf4490ca -s ours am: 4db5b70bc1 -s ours am: 65cc1e53f9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12079852
Change-Id: I66eb800d2c2ee79bc9528ea19c6c88004160e067
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions