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