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