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