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