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