am cbc90453: am 14958e21: Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1

* commit 'cbc90453248bd3f9a11fdbc07e544d4a39592934':