Hung-ying Tyan c7e4b2d5bb am 841d6ff9: am 62ec9834: Merge "Make SipService broadcast SIP_SERVICE_UP when it\'s up." into gingerbread ...

Merge commit '841d6ff9e05daccbc60daa1618a27e9db3a4fb32'

* commit '841d6ff9e05daccbc60daa1618a27e9db3a4fb32':
  Make SipService broadcast SIP_SERVICE_UP when it's up.

2010-10-08 18:28:20 -07:00

..

java

am 841d6ff9: am 62ec9834: Merge "Make SipService broadcast SIP_SERVICE_UP when it\'s up." into gingerbread

2010-10-08 18:28:20 -07:00

jni/rtp

resolved conflicts for merge of 4790a2e2 to master

2010-10-09 08:07:55 +08:00