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