[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: 8d5ac64187
-s ours
am skip reason: subject contains skip directive
Change-Id: Ie081ee0dea24cc13d14a64ac4b2c81af2ccdc8b9
This commit is contained in:
commit
3b0a4a9282