Marco Nelissen 2c2415a552 am 3ea395dd: am 4e853598: Merge "Fix printf format" ...

* commit '3ea395ddc7785bf8fb6df1e5e6ed142c9336a7eb':
  Fix printf format

2015-01-27 20:33:09 +00:00

..

java/android

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

2015-01-27 18:28:53 +00:00

jni

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

2015-01-27 20:33:09 +00:00

lib

…

mca

Add missing <string.h> includes.

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

tests

resolved conflicts for merge of 09910723 to lmp-mr1-dev-plus-aosp

2014-11-21 09:57:52 -08:00