am 756e75cf: am 090c60bb: Merge change I73b60354 into eclair
am 756e75cf: am 090c60bb: Merge change I73b60354 into eclair

Merge commit '756e75cfcfbd5b311167de9661a1e3376dd4c4db' into eclair-mr2-plus-aosp

* commit '756e75cfcfbd5b311167de9661a1e3376dd4c4db':
  AudioFlinger: delete Track object when createTrack() fails due to lack of tracks in AudioMixer.

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