[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 8b9c85f0cd
-s ours
am: 8611a6d851
-s ours
am skip reason: subject contains skip directive
Change-Id: Ia14c2a36c4de7485f77c634aef5cadfc47bb1a50
This commit is contained in: