[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 4349d7e867 -s ours am: bd30d0521d -s ours am: 63b5dd138e -s ours am: e3f1bd5842 -s ours
am skip reason: subject contains skip directive Change-Id: I2e19ed16a3c6be2a56c4c5deda97d0b9f9605174
This commit is contained in: