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