[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 7b9006e18c
-s ours
am: 7735923c52
-s ours
am skip reason: subject contains skip directive
Change-Id: Id87ca3692199c37b4ed40e07bcd3f298c0344642
main
commit
ccc704609c