[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: e8f08872c2 -s ours am: 7e606fdf97 -s ours am: 302a8d7d1d -s ours am: 7410debb29 -s ours
am skip reason: subject contains skip directive Change-Id: I9f834135d05fad48461d26b741df5df9f9ce8ee8
This commit is contained in: