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