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

* commit 'cba06c2272c8bce7d10b2a7ee762d12043f3252a':
  Frameworks/base: Wall Werror in media/jni

2014-11-11 04:02:22 +00:00

..

java/android

am e8d0fe98: am ae61ea93: am 220b65d2: am 94c3e3bf: Merge "Fix NPE for CTS." into lmp-sprout-dev

2014-11-07 04:12:06 +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

Fix name error in com.android.mediadrm.signer.xml

2014-05-30 08:27:33 -07:00

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