[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: af6b60c523
-s ours
am skip reason: subject contains skip directive
Change-Id: Idd860e9f22ab1117549f848c08ca998b63e51469
This commit is contained in:
am: af6b60c523
-s ours
am skip reason: subject contains skip directive
Change-Id: Idd860e9f22ab1117549f848c08ca998b63e51469