[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 6486b82908
-s ours
am: 9ee53eb277
-s ours
am skip reason: subject contains skip directive
Change-Id: Iafe93926687b2bf691f3c2ae5d97152bfc2589d4
This commit is contained in:
commit
b4795def65