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

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