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