OSDN Git Service

am f6354aca: Merge "CallManager: do not deliver ring event if fg call is live." into...
authorHung-ying Tyan <tyanh@google.com>
Wed, 18 Aug 2010 20:37:11 +0000 (13:37 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 18 Aug 2010 20:37:11 +0000 (13:37 -0700)
commitd0c10c21cec1d3ea6323bb689ba592502c66a171
treefb83fc771227be89eea4d0157c28d50183755df4
parentba5a690cf8bc8a06831a8330cbd391ae0e6025a2
parenta71e074ae4bdcbdef30241a08f23ad9948e69df2
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.