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