Glenn Kasten 877ffde5f6 Merge "Synchronize channel masks in AudioFormat with system/audio.h"

2014-03-31 17:58:36 +00:00

..

java/android

Merge "Synchronize channel masks in AudioFormat with system/audio.h"

2014-03-31 17:58:36 +00:00

jni

am 303d666f: am 0e3f3c70: am 91bbb75c: Merge "Cast CallMethod\'s size_t parameters to jint"

2014-03-31 09:53:35 +00:00

lib

resolved conflicts for merge of e0b14ea7 to master

2013-12-13 15:59:51 -08:00

mca

Remove deprecated BufferQueue constructor

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

tests

Remove SkOmxPixelRef to fix build.

2014-03-27 17:36:18 -04:00