[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 skip reason: subject contains skip directive Change-Id: Ib84982c2b876b003e27c5dc3c56e32c26c4546f3
This commit is contained in: