Chong Zhang 7b1c33f7a4 am 00795e9e: Merge "return error MEDIA_ERROR_UNSUPPORTED when Range request fail" into lmp-mr1-dev ...

automerge: 6610985

* commit '6610985c35683fbc2bd827df97bdd185fe67248b':
  return error MEDIA_ERROR_UNSUPPORTED when Range request fail

2014-11-11 18:52:23 +00: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

Frameworks/base: Wall Werror in media/mca

2014-11-10 17:49:02 -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