tree 1cff6bdb76babdb31489d96513b6b1a663e7dadc
parent 1f6bee072edfe440f91341c361a47b5825e99283
parent cab967095570c5d589bd7d38317bab2986b4fb1e
author Jeff Sharkey <jsharkey@android.com> 1369958064 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1369958064 -0700

am cab96709: Merge "Revert "Change titile from Ringtone to Notification sound""

* commit 'cab967095570c5d589bd7d38317bab2986b4fb1e':
  Revert "Change titile from Ringtone to Notification sound"