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