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