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