diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-23 18:29:10 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-23 18:29:10 +0000 |
commit | f164789d8ffa4bf81eafeb201c28f833c4a16ac6 (patch) | |
tree | 5c9a79eccf75bf4114202965af78e891dd5f0b00 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 994f2578bf6a0aa343ebf7a38685cbae81c9fa4a (diff) | |
parent | 7dd6b5bb5ccda5b01b084550a1e35b65b7e6cced (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: dffcd5fe7a -s ours am: be8cba0fac -s ours am: 7dd6b5bb5c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11961575
Change-Id: I62596e8a5d82fdb0fe54a1455128796e38bb1984
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions