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