am baced375: Merge "Silently reject a ringing call when another call is...
am baced375: Merge "Silently reject a ringing call when another call is dialing/ringing." into gingerbread
Merge commit 'baced375' into gingerbread-plus-aosp
* commit 'baced375':
Silently reject a ringing call when another call is dialing/ringing.