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

Merge commit 'baced375ba5f374445c44a2115700d69693794a0' into gingerbread-plus-aosp

* commit 'baced375ba5f374445c44a2115700d69693794a0':
  Silently reject a ringing call when another call is dialing/ringing.
This commit is contained in:
Hung-ying Tyan 2010-10-20 13:56:59 -07:00 committed by Android Git Automerger
commit 31251614b9

Diff Content Not Available