[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 skip reason: subject contains skip directive Change-Id: I944b487bae2033b2272d584ec0f83d8e1bc09eb7
This commit is contained in: