diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-05 21:12:20 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-05 21:12:20 +0000 |
commit | 4db5b70bc1f4cd4e2d97b1df587d36c2bec84691 (patch) | |
tree | 561749b3430cb193d422f50de3dbf5cac6991c23 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | f75e86e3f1132046957c9c720586d61a63ec3207 (diff) | |
parent | 2acf4490cad16a8b9035e161b711717b170e5e30 (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12079852
Change-Id: I5f2a29c517273b33daf2844026234737b9c8b710
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions