[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
am: 14e8d19136
-s ours
am skip reason: subject contains skip directive
Change-Id: Id5e5f06d7b2be7890bb09fb4b006c47e7934e7dd
main
commit
29cd55ff3f