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