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