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