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