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