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