am 6e58cf21: Merge change I020d2e34 into eclair
am 6e58cf21: Merge change I020d2e34 into eclair

Merge commit '6e58cf21088c2e6b0ef52572bfd544347e02fc17' into eclair-plus-aosp

* commit '6e58cf21088c2e6b0ef52572bfd544347e02fc17':
  Invoke the OnErrorListener callback when MediaPlayer.setDataSource() throws.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base