[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 8d5ac64187
-s ours
am: 3e5c5b08bb
-s ours
am skip reason: subject contains skip directive
Change-Id: Ic1d35dee7e21c56a1b53863b8d9efb3412a2f3a6
main
commit
4bf7bb1b8d