Merge commit '0a210585758e1b3ede232b9dddb1494a55dc157a' into eclair-mr2-plus-aosp
* commit '0a210585758e1b3ede232b9dddb1494a55dc157a':
Fix issue 2245963: incoming call rings in ringtone-volume level through a wired headset is while listening to music.