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