Lajos Molnar 7d612f0deb am 0b10f9c0: am 63845f1b: am c398f175: Merge "media: fix isSupportedFormat for integer frame rate" into lmp-mr1-dev ...

* commit '0b10f9c0ab9a6c4003a2a300c2a38f7ca2144fdb':
  media: fix isSupportedFormat for integer frame rate

2014-11-24 18:12:56 +00:00

..

java/android

am 0b10f9c0: am 63845f1b: am c398f175: Merge "media: fix isSupportedFormat for integer frame rate" into lmp-mr1-dev

2014-11-24 18:12:56 +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