Andreas Gampe 5e88177ecb Merge "resolved conflicts for merge of 09910723 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp ...

automerge: 935fd8d

* commit '935fd8d0b1c7953e6e6610aea0c2d09d0fa8ba97':
  Frameworks/base: Wall Werror in media/tests

2014-11-21 18:27:52 +00:00

..

java/android

am c229c393: am 09ff9125: Merge "Convert record channel mask for dynamic mix" into lmp-mr1-dev automerge: 14b9092

2014-11-21 02:58:20 +00:00

jni

Merge "Fix Crash when sending null in HashMap to getKeyRequest"

2014-11-20 23:29:08 +00:00

lib

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

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

mca

Move frameworks/base over to libc++.

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

tests

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

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