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