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