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