Merge commit 'e0042598585e4ad8b74561c00511bf85c9bf88f8' into eclair-plus-aosp * commit 'e0042598585e4ad8b74561c00511bf85c9bf88f8': Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72).