tree b69477e69c2831ef759f5f44e5793efa2ddcbb25
parent 3606cb75293c770550a4c6211c02c60bcb0369d5
parent 933a59537a81b136d8781a0bcc6ca56e23f9e78d
author Yorke Lee <yorkelee@google.com> 1440706460 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440706460 +0000

am 933a5953: am df4b1986: (-s ours) am e2788366: Merge "Fix SecurityException when trying to retrieve ringtone title" into mnc-dev

* commit '933a59537a81b136d8781a0bcc6ca56e23f9e78d':