Hung-ying Tyan 99f92ac7a4 am f5b7c855: am f5201ab7: Keep original phone number in SipConnection. ...

Merge commit 'f5b7c855fbb69e8614dab5ca15639228a2428784'

* commit 'f5b7c855fbb69e8614dab5ca15639228a2428784':
  Keep original phone number in SipConnection.

2010-10-13 17:02:08 -07:00

..

java

am f5b7c855: am f5201ab7: Keep original phone number in SipConnection.

2010-10-13 17:02:08 -07:00

mockril

resolved conflicts for merge of d4e3bf4d to master

2010-10-12 11:05:54 -07:00

tests

resolved conflicts for merge of d4e3bf4d to master

2010-10-12 11:05:54 -07:00