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