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