diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-06 14:35:01 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 14:35:01 +0000 |
commit | 964dc598ca3ca738a4c6ceb32cb42dbc9692c670 (patch) | |
tree | 14c2f9a0d1746438eb6ef897297c6b0c8e48e4a9 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | f867f48e55d4902cd7c0cec963c186d35d8d931b (diff) | |
parent | c4919e09ff79c35a8ec2ffd075f743dd36e28dde (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: cc4a65b365 -s ours am: e861ab7cb2 -s ours am: 4b4922186a -s ours am: c4919e09ff -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12086503
Change-Id: I0dc92ae5c1e3b3d991e928a3486917f8b054b8eb
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions