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