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