diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-17 16:54:53 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-17 16:54:53 +0000 |
commit | cf868e32bc20522ecdd4d777e8cdaebeec773992 (patch) | |
tree | 71e1a4d9f8b278f60c595ad63e47d80555b97302 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 82cd1cf1f78ca2f897ec122691c6a1ddf491ec12 (diff) | |
parent | ce08815e5be730c59f6c1c76883bb2ddc9a67756 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: ac28b37ec6 -s ours am: ce08815e5b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11887950
Change-Id: I0a763146ac7c1ec672726befc979674dfe12a15a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions