tree e9bdcd01cb1a74d17275a3c2889fefa91e0405b8
parent 2446cc6f14f63359d7b96e011404d65dfee17a27
parent a2a3b91c6896ebf0e75ec6b86f792b7b4f10e38e
author Jeff Sharkey <jsharkey@google.com> 1438637998 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438637998 +0000

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.