Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 32bb8f9993
-s ours am: 0159a56eb0
-s ours
am: 43a72fe360
-s ours
am skip reason: subject contains skip directive
Change-Id: I822bbde9af45981a03808d1c2972aaa04bdc53f5
main
commit
872d799297