Jean-Michel Trivi 0456e3aab1 Merge "MediaFocusControl: priority to playing players for media button"

2014-04-22 17:36:10 +00:00

..

java/android

Merge "MediaFocusControl: priority to playing players for media button"

2014-04-22 17:36:10 +00:00

jni

am e618f184: am 72eec7f6: Merge "Allow DRM plugins to be destroyed when released" into klp-modular-dev

2014-04-21 21:06:13 +00:00

lib

resolved conflicts for merge of 4f342e87 to master

2014-04-03 11:51:37 -07:00

mca

Remove deprecated BufferQueue constructor

2014-03-12 17:02:07 -07:00

tests

MediaFrameworkTest: Fix Camera2 API unit test build breakage

2014-04-10 17:09:22 -07:00