[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 3779025590
-s ours am: e0bc29df11
-s ours
am skip reason: subject contains skip directive Change-Id: Ifdeb07456af76024e651cf6723c71bcb037762f8
This commit is contained in: