tree 073aa6f8c909b8a52dba446f420c36392fb7f218
parent 107f6f6acca744782d12e4e9dacc07a05e0acdf1
parent 846169755a60c7f2a12deb5a8770eb790b512cae
author Yorke Lee <yorkelee@google.com> 1437157112 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437157112 +0000

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

* commit '846169755a60c7f2a12deb5a8770eb790b512cae':
  Fix SecurityException when trying to retrieve ringtone title