Dan Albert b28ff487fb resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aosp ...

Change-Id: If21bd328a5c8ea3474abfe624e910d4830c72dc9

2014-11-12 13:24:42 -08:00

..

java/android

Merge "return error MEDIA_ERROR_UNSUPPORTED when Range request fail" into lmp-mr1-dev

2014-11-11 18:33:21 +00:00

jni

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

2014-11-10 19:41:52 -08:00

lib

…

mca

Move frameworks/base over to libc++.

2014-11-12 11:22:20 -08:00

tests

am 694fd58d: am fed9888e: Merge "Remove outdated tests for custom decoder." into lmp-mr1-dev

2014-10-22 22:39:30 +00:00