am aaa01b18: Merge "    Fix bug 2670395 and 2599698     When the user selects a "Silent" notification sound, the Uri encoded     path is an empty string. Setting this Uri as the data source of the     MediaPlayer used to play notifications caused the completion listen

Merge commit 'aaa01b181c0eea4ff6496d446e25e499b12ca14c' into froyo-plus-aosp

* commit 'aaa01b181c0eea4ff6496d446e25e499b12ca14c':
  Fix bug 2670395 and 2599698