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