[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 skip reason: subject contains skip directive Change-Id: I61197f3358229d8a0764af9144292bed64928609
This commit is contained in: