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