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