[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 9db1319d77
-s ours
am: 3be975240e
-s ours
am skip reason: subject contains skip directive
Change-Id: Ife6a0d363fb4753f04285bbe3553f14b9a19c378
main
commit
999a254183