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