tree e42fa2a84a55a08305e86d7bebf0b0f01c1a3b23
parent 8cbaf59e313227d41c9881fbedb4dc3255a83b8d
parent f6354aca3a4d0571a66747d9cdc247a1d411d660
author Hung-ying Tyan <tyanh@google.com> 1282163831 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282163831 -0700

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.