Dan Albert 45670c1dc5 am b28ff487: resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aosp ...

* commit 'b28ff487fb6db4a44e4d18aa17d8253f00a63bb6':
  Move frameworks/base over to libc++.

2014-11-12 21:31:33 +00:00

..

java/android

am 7b1c33f7: am 00795e9e: Merge "return error MEDIA_ERROR_UNSUPPORTED when Range request fail" into lmp-mr1-dev automerge: 6610985

2014-11-11 18:55:35 +00:00

jni

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

2014-11-11 04:02:22 +00: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