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