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