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