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