[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: I19a26a04df56212c59f2f74e64dfdcd333ff0ca6
This commit is contained in: