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

Change-Id: Ia70adeef06afddd29c827405fb5657bf9f5a29a3

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

..

java

resolved conflicts for merge of 2a36a778 to master

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

jni/rtp

Fix the unhold issue especially if one is behind NAT.

2010-09-27 23:53:39 +08:00