[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 85dcca9b69 -s ours
am: 192798c87e -s ours
am skip reason: subject contains skip directive
Change-Id: Ic4a6506017667a50ba1e4164100d3d80db8dd04a
This commit is contained in: