am f6354aca: Merge "CallManager: do not deliver ring event if fg call is live." into gingerbread
Merge commit 'f6354aca3a4d0571a66747d9cdc247a1d411d660' into gingerbread-plus-aosp * commit 'f6354aca3a4d0571a66747d9cdc247a1d411d660': CallManager: do not deliver ring event if fg call is live.
This commit is contained in:
commit
d0c10c21ce