[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: abff0ad0e3
-s ours am: 7c609c0cc4
-s ours
am: fb2d095a03
-s ours
am skip reason: subject contains skip directive
Change-Id: Ifbf7a39926061a9f87cc65a70ced6f5f553dd2bd
main
commit
87a09a190c