[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: a047102265
-s ours
am: fb337911b8
-s ours
am skip reason: subject contains skip directive
Change-Id: I609844af08d5ea60d781c88486217aff17c997ba
main
commit
b31f499e90