[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: I14c3f89c63eb475728b903dd55a0dfabc866b04e
This commit is contained in: