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

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