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