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