am 45bd8303: Merge "Uncomment SIP/VOIP feature check in SipManager." into gingerbread
am 45bd8303: Merge "Uncomment SIP/VOIP feature check in SipManager." into gingerbread

Merge commit '45bd8303fe20f20843f5a76ddf42a5ace54add58' into gingerbread-plus-aosp

* commit '45bd8303fe20f20843f5a76ddf42a5ace54add58':
  Uncomment SIP/VOIP feature check in SipManager.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base