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