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