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