diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-12 15:35:49 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-12 15:35:49 +0000 |
commit | f51cab9b7acaf493eb338133b9631747222beec4 (patch) | |
tree | 38a179826e87a9053155f6d5e8bc2f4ef10cedbd /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | fa53c6abc4fc5469d413466c125a952cec4730d2 (diff) | |
parent | 604e89aff0fe8b69b5c7ad23f86346a62850a16c (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 77e3cce083 -s ours am: 981cdf9ed6 -s ours am: f9660d7e69 -s ours am: 604e89aff0 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12136585
Change-Id: I0ac687e2b4b3f5746d44a182a1ab6aea86d230c8
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions