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

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