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