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