[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
am: a47de0ea53
-s ours
am skip reason: subject contains skip directive
Change-Id: I2aefc157ff64e0e3b62d16909e0cf56ef1408b42
main
commit
b2d2dff9b6