Marco Nelissen 565bca4e19 am 3ea395dd: am 4e853598: Merge "Fix printf format" ...

automerge: 2c2415a

* commit '2c2415a552b62016886af62419080ca7ac327871':
  Fix printf format

2015-01-27 23:40:39 +00:00

..

java/android

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

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

jni

am 3ea395dd: am 4e853598: Merge "Fix printf format"

2015-01-27 23:40:39 +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