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