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