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