Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 41c7e07d12
-s ours am: 0bc3df3750
-s ours am: dc9a31d129
-s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp
This commit is contained in:
commit
a8b8b8a541