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