[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 0f05db89c3 -s ours am: 5b04790e16 -s ours am: 5c5440a0ea -s ours am: 83afbfef41 -s ours am: 60e83f5f5b -s ours
am skip reason: subject contains skip directive Change-Id: I1dbab2733fdbdf0dcaea314918ea29e137edc3e5
This commit is contained in: