Marco Nelissen 0a3f0b020e am 99985d98: am e74da38e: Merge "Make SoundPool use MediaCodec" ...

automerge: 6e14c57

* commit '6e14c5705c5acf9d6036060252f257a084cd7578':
  Make SoundPool use MediaCodec

2015-01-27 23:33:05 +00:00

..

java/android

am 99985d98: am e74da38e: Merge "Make SoundPool use MediaCodec"

2015-01-27 23:33:05 +00:00

jni

am 99985d98: am e74da38e: Merge "Make SoundPool use MediaCodec"

2015-01-27 23:33:05 +00:00

lib

…

mca

Add missing <string.h> includes.

2015-01-25 08:33:36 -08:00

tests

Fix bad import in VideoDumpActivity

2015-01-13 10:24:48 +01:00