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