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