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