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