tree 5b5adc9d5ac9b87facb695d08e2b90660f4db80c
parent 98f5af661779164a4ff277d29c91831ef2938a88
parent 95508fd57e8bc2989d6f00eecf24c14fc16bb092
author Yorke Lee <yorkelee@google.com> 1437155378 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437155378 +0000

am 95508fd5: am e2788366: Merge "Fix SecurityException when trying to retrieve ringtone title" into mnc-dev

* commit '95508fd57e8bc2989d6f00eecf24c14fc16bb092':
  Fix SecurityException when trying to retrieve ringtone title