am 9aad0a66: am c5ab362a: Add a setting to change the default ringtone.

Merge commit '9aad0a66159958c6107c91b07704e714b170c3f3'

* commit '9aad0a66159958c6107c91b07704e714b170c3f3':
  Add a setting to change the default ringtone.
tree: 578e54cd5084d6fa0e182c63a57f127c6b01f545
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE