am a864b304: am 50961218: am 4b7a66a8: Merge "Pass string key when updating ringtone." into lmp-mr1-dev

* commit 'a864b304c3037b7a75cfa7fd181148c2adee76ef':
  Pass string key when updating ringtone.
tree: d237d9246e1f9b963d1981f8a951dbae23f8a104
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags