am e3e0586d: Merge "Fix RingertoneManagerTest#testStopPreviousRingtone" into froyo

Merge commit 'e3e0586d8e119edad5442b4bdcf162e78ec154c0' into froyo

* commit 'e3e0586d8e119edad5442b4bdcf162e78ec154c0':
  Fix RingertoneManagerTest#testStopPreviousRingtone