Merge "Allow ogg files to be selected as ringtones" into oc-dev
am: d44afb99c8

Change-Id: Ia99142562cd97ad5aeec2dfa40a63d80657a2c0d