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