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