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