am d3c1bae4: Merge "Make sure that if initialization fails, AudioSource still behaves well." into gingerbread
am d3c1bae4: Merge "Make sure that if initialization fails, AudioSource still behaves well." into gingerbread

Merge commit 'd3c1bae4eb78404bd1e17b7acf67087a18c83ef3' into gingerbread-plus-aosp

* commit 'd3c1bae4eb78404bd1e17b7acf67087a18c83ef3':
  Make sure that if initialization fails, AudioSource still behaves well.

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