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