tree 073aa6f8c909b8a52dba446f420c36392fb7f218
parent 979f4343e392a6627b5a3227d48219479b5ba541
parent 0cab1c58941a4064140c94efb7888b06db78e664
author Yorke Lee <yorkelee@google.com> 1437156194 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437156194 +0000

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

* commit '0cab1c58941a4064140c94efb7888b06db78e664':
  Fix SecurityException when trying to retrieve ringtone title