Hung-ying Tyan a57afb6a6c resolved conflicts for merge of 2a36a778 to master ...

Change-Id: Ia70adeef06afddd29c827405fb5657bf9f5a29a3

2010-09-28 12:17:44 +08:00

..

android/net

am 44669d31: am fd144d76: Merge "SipAudioCall: remove SipManager dependency." into gingerbread

2010-09-27 11:47:42 -07:00

com/android/server/sip

Move SipService out of SystemServer to phone process.

2010-09-28 05:19:35 +08:00