Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: ea59105148
-s ours am: 74cc0f8c3e
-s ours
am: 37c765eb20
-s ours
am skip reason: subject contains skip directive
Change-Id: Ia4d0103d00f9a03bc202f0a0f61b292d9d83d922
main
commit
0c6181275b