Narayan Kamath b1ed19a2ed am 43c9516a: am 860bba68: am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code" ...

* commit '43c9516a29563131e04ee797562130e2c4f9d54e':
  Fix in MediaMuxer's JNI code

2014-02-11 16:40:35 +00:00

..

java/android

Remove no longer needed http proxy handling code, it's obsolete now

2014-02-05 11:53:40 -08:00

jni

am 43c9516a: am 860bba68: am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code"

2014-02-11 16:40:35 +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