tree c560330f63f0d44302791c6c42268f18c5732def
parent 794a751ba6b6322883c36980e5e2999f6322f005
parent df4b1986f5c096a8750ecafb6f7e4a83d6ba18b7
author Yorke Lee <yorkelee@google.com> 1440672954 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440672954 +0000

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

* commit 'df4b1986f5c096a8750ecafb6f7e4a83d6ba18b7':