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