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