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