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