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