[automerger skipped] Merge "Check the media.settings.xml property" into qt-dev...
[automerger skipped] Merge "Check the media.settings.xml property" into qt-dev am: b9df2ec0 am: 16dadd0a
am: d2cd6284 -s ours
am skip reason: change_id Ib7070cca94b9d637b9a1a175d09baf7b78ec0fd9 with SHA1 ef8695ed is in history
Change-Id: I6859e8445de1b08eb4438059d57a724ae0cf0540