[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 32bb8f9993
-s ours
am: 0159a56eb0
-s ours
am skip reason: subject contains skip directive
Change-Id: I6b2d10370d7102e02773b267a945d923c390e6a3
main
commit
f44e8d06b2