Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 6b7a42ebf2
-s ours am: 62880febef
-s ours am: 2a33dbf0fa
-s ours
am: 06a6bf5ecc
-s ours
am skip reason: subject contains skip directive
Change-Id: Id975ffda749e3e9483447cd7b81ce97cc75c82ed
main
commit
62dcf1d391