[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
am: 028cdfdd05
-s ours
am skip reason: subject contains skip directive
Change-Id: I392428afd7d2c6dc0d6174afee6bdcd6b688bdcd
main
commit
65c62dc5e9