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