Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: ea59105148
-s ours am: 0db63f2126
-s ours
am: fe1d338fa1
-s ours
am skip reason: subject contains skip directive
Change-Id: Ibc478ff435823870037178eddd54dd95edf85125
This commit is contained in:
commit
72b8877c82