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