diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-05 06:15:49 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-05 06:15:49 +0000 |
commit | 6559c1451688ec46fe0940a961b6439ee13b70d3 (patch) | |
tree | 3905411e667d2ff53356e06be0d975bfd0957e9d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | db4fa0a3bd8edf50c62295ede0d76d98cb5e07f6 (diff) | |
parent | 56c556b05dae2e8e9c93bcf06996e5bf6db30c97 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: b43c3c0388 -s ours am: 56c556b05d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12076168
Change-Id: I0baa633289aa03eded2988aacfe6bb6a34ba29e3
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions