[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 9e6eec4743 -s ours
am skip reason: subject contains skip directive Change-Id: I0774461ee02bfc94d5af24f8fd3ffdc29b11e872
This commit is contained in: