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