Chong Zhang 128b012cc8 fix MediaCodec release deadlock and resource leak ...

Bug: 12910147
Change-Id: I5f2c02b6ad5bfcd88797c6aa79dcaa23d030eacf

2014-03-03 12:29:49 -08:00

..

java/android

Merge "Move Session apis to android.media.session"

2014-02-26 18:13:35 +00:00

jni

fix MediaCodec release deadlock and resource leak

2014-03-03 12:29:49 -08: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 "Fix includes so that they no longer rely on the global Skia includes directories."

2014-02-28 13:23:15 +00:00