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