[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: 6f4ed8f123
-s ours
am skip reason: subject contains skip directive
Change-Id: I508dad6ceca97a79e226894e410f59b87425ee5f
This commit is contained in:
commit
d731040faa