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