[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: dd6e85b216 -s ours am: 1245d88a9f -s ours am: dd5ea62c49 -s ours am: dc195db59a -s ours am: 7fb5dfb4ad -s ours am: eea6eac929 -s ours
am skip reason: subject contains skip directive Change-Id: Ia8016c954ca0a4293238ebf25b14b5720dbef238
This commit is contained in: