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