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