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