[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: 52c7656063 -s ours
am skip reason: subject contains skip directive Change-Id: I46c07b9af98fcd7177daa1612cb8276080ee5972
This commit is contained in: