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