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