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

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