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