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