Chung-yih Wang 7ff6f97f84 resolved conflicts for merge of 4790a2e2 to master ...

Change-Id: I659ccd9a51e24f217f715178a98eaf6592c258d7

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

..

java

am a785a59c: am 718e0033: Merge "SIP: add SERVER_UNREACHABLE error code." into gingerbread

2010-10-06 17:08:43 -07:00

jni/rtp

resolved conflicts for merge of 4790a2e2 to master

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