Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: e801eb78f0
-s ours am: ffe1c80f35
-s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp
This commit is contained in:
commit
6f4a9d32bb