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