tree c805cc5de81145954921d0bff90e620ef5ed7333
parent 2a08e2a9f881d06a03e36367585137e05706f592
parent d580eee29b50e1f11485b655fe5e6cc5a564615b
author Hung-ying Tyan <tyanh@google.com> 1283913640 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283913640 -0700

am d580eee2: Merge "SipPhone: switch to its own phone type PHONE_TYPE_SIP." into gingerbread

Merge commit 'd580eee29b50e1f11485b655fe5e6cc5a564615b' into gingerbread-plus-aosp

* commit 'd580eee29b50e1f11485b655fe5e6cc5a564615b':
  SipPhone: switch to its own phone type PHONE_TYPE_SIP.