diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-06 14:23:04 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 14:23:04 +0000 |
commit | 58c18b6fd69313e03ce89d0ba5b3c77aecac5b80 (patch) | |
tree | 4dc1880b8fa57b28ce990067e0049c0f065dcc8c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | f543fb5832fb7114089fcb59ffd6c2df46e546c7 (diff) | |
parent | 2d8b9626983960a12d9ffb89b44e016a8899061b (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 1cdb57b79a -s ours am: cce78f1da7 -s ours am: 2d8b962698 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12086566
Change-Id: If16560d8156c93bb64cc7739ae569860c171dabb
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions