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

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