Brad Fitzpatrick 385a753dea resolved conflicts for merge of 368fdba4 to master ...

Change-Id: I42b7b433c86a71a5da5db67109f056a280077c9d

2010-10-21 07:39:10 -07:00

..

android/net

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

2010-10-19 09:54:16 -07:00

com/android/server/sip

Reduce logging.

2010-10-19 15:08:05 -04:00