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