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