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