am a2a3b91c: am c30d7327: am b1e54abd: am 591ab090: am 3ba2bfa7: Merge "Expand ringtone titles to support OGG and FLAC." into mnc-dev

* commit 'a2a3b91c6896ebf0e75ec6b86f792b7b4f10e38e':
  Expand ringtone titles to support OGG and FLAC.