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