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