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