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