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