OSDN Git Service

am 6037a056: Fix n-way conf call in SipPhone.
authorHung-ying Tyan <tyanh@google.com>
Wed, 20 Oct 2010 21:03:43 +0000 (14:03 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 20 Oct 2010 21:03:43 +0000 (14:03 -0700)
Merge commit '6037a056ea0dda27a286ddcb527b323b58a1c7c7' into gingerbread-plus-aosp

* commit '6037a056ea0dda27a286ddcb527b323b58a1c7c7':
  Fix n-way conf call in SipPhone.


Trivial merge