tree d754b7623e8e7220ba3cfe04542e61174f6deed5
parent 50c5d022374e585190016b202059de2046bf53c4
parent 5666350907f93edf00bf2a73475afe940b14a699
author Yorke Lee <yorkelee@google.com> 1437157904 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437157904 +0000

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

* commit '5666350907f93edf00bf2a73475afe940b14a699':
  Fix SecurityException when trying to retrieve ringtone title