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