[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 5064d96e3a
-s ours am: f97c675cde
-s ours am: 0da8214ae4
-s ours
am skip reason: subject contains skip directive Change-Id: I5b7d82d1a6e108b7b970e2b89b35c8ec590bfb59
This commit is contained in: