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