[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 skip reason: subject contains skip directive Change-Id: I204cea9f138462beb6b0ffca74df7e3b46e0a354
This commit is contained in: