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