[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 946037ccaa
-s ours
am: df13f0a381
-s ours
am skip reason: subject contains skip directive
Change-Id: I8f637350f8bf23339f983ac162a448907a6dfe41
main
commit
febe33b053