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