Chong Zhang d7eab895b7 Merge "MediaRecorderTest: add tests for getSurface() and SURFACE source"

2014-02-06 00:20:03 +00:00

..

java/android

Merge "FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to media code"

2014-02-05 17:13:07 +00:00

jni

Merge "android_media_MediaMuxer_setLocation: amended signature."

2014-02-05 20:05:17 +00:00

lib

resolved conflicts for merge of e0b14ea7 to master

2013-12-13 15:59:51 -08:00

mca

Resolved conflicts for merge of 28c6ec02 to master

2014-01-16 15:49:59 +00:00

tests

Merge "MediaRecorderTest: add tests for getSurface() and SURFACE source"

2014-02-06 00:20:03 +00:00