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