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