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