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