RoboErik 3328868544 Merge "Initial round of MediaSession APIs"

2014-02-20 00:25:10 +00:00

..

java/android

Merge "Initial round of MediaSession APIs"

2014-02-20 00:25:10 +00:00

jni

Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest."

2014-02-13 17:22:33 +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