Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 91d2a1cc28 -s ours am: bdce4d4bd9 -s ours
am: 171a77af76 -s ours
am skip reason: subject contains skip directive
Change-Id: I0d924b0ac59953824c96230c0987c27112fc89ca
This commit is contained in: