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