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