[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 skip reason: subject contains skip directive Change-Id: I1780d6080610aa3885e01d36d12252727952a2f8
This commit is contained in: