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