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