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