am 16848a15: am f6354aca: Merge "CallManager: do not deliver ring event if fg...
am 16848a15: am f6354aca: Merge "CallManager: do not deliver ring event if fg call is live." into gingerbread
Merge commit '16848a15'
* commit '16848a15':
CallManager: do not deliver ring event if fg call is live.