[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 65964e053e -s ours am: c5cd021665 -s ours am: eb32a6e7fd -s ours am: e274ce13da -s ours
am skip reason: subject contains skip directive Change-Id: Iebf577d8445e9d9ca9db1b7a1096b21fa7ebac22
This commit is contained in: