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