Hung-ying Tyan f83d4f1779 resolved conflicts for merge of 3e4975a5 to master ...

Change-Id: Icd382fc43c8a1975801ab42eb184b633520149c7

2010-09-02 09:56:04 +08:00

..

java/android/net

resolved conflicts for merge of 3e4975a5 to master

2010-09-02 09:56:04 +08:00

jni/rtp

Revert "RTP: integrate the echo canceller from speex."

2010-08-26 10:33:09 +08:00