[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 9223659928
-s ours
am: 545560b547
-s ours
am skip reason: subject contains skip directive
Change-Id: I88dc3ae882b713ce134f45044dd51e54dbb78ac2
main
commit
5f9a1f096a