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