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

* commit '846169755a60c7f2a12deb5a8770eb790b512cae':
  Fix SecurityException when trying to retrieve ringtone title
tree: 073aa6f8c909b8a52dba446f420c36392fb7f218
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml