OSDN Git Service

am fc7e7766: Merge "CallManager/SipPhone: fix reject a ringing call" into gingerbread
authorHung-ying Tyan <tyanh@google.com>
Wed, 6 Oct 2010 01:37:14 +0000 (18:37 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 6 Oct 2010 01:37:14 +0000 (18:37 -0700)
Merge commit 'fc7e7766e7d6a49d31426f821c0a56168c0d75cc' into gingerbread-plus-aosp

* commit 'fc7e7766e7d6a49d31426f821c0a56168c0d75cc':
  CallManager/SipPhone: fix reject a ringing call


Trivial merge