diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-12 15:24:01 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-12 15:24:01 +0000 |
commit | 604e89aff0fe8b69b5c7ad23f86346a62850a16c (patch) | |
tree | e783e66afb06d9d40a4cb489bc477f489757bec1 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | d0e083174cb7abdccb2060239c9c84e99f131b9f (diff) | |
parent | f9660d7e69fac4e0a1300cf1439f7b7140cee466 (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12136585
Change-Id: I362e2c364aa526a6a9d1e22ccaf31403cc974d3f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions