Christopher Tate f131611d03 resolved conflicts for merge of b89ce434 to master ...

Change-Id: Ida7ef25adc2f4b9f22d8662c9f0e8a1ec9df0d55

2012-05-03 18:18:34 -07:00

..

java/android

resolved conflicts for merge of b89ce434 to master

2012-05-03 18:18:34 -07:00

jni

New API to set the video rendering mode on a MediaCodec instance.

2012-04-30 14:46:22 -07:00

libdrm

…

mca

Fix b/5974573 Please increase intensity of film grain effect

2012-05-03 13:08:15 -07:00

tests

…