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