[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: I92cb2ff59c49906807f350a7896bd5bffbb3c9ff
This commit is contained in:
commit
f280b745b6