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