[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: dd6e85b216 -s ours am: 1245d88a9f -s ours am: dd5ea62c49 -s ours am: dc195db59a -s ours am: 7fb5dfb4ad -s ours
am skip reason: subject contains skip directive Change-Id: I3b99a4700fb95e0133a861086ca4cf5677912730
This commit is contained in: