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

* commit '63845f1b5853aa3a84df4a161f6c8e96b98fba8a':
  media: fix isSupportedFormat for integer frame rate

2014-11-24 18:05:46 +00:00

..

java/android

media: fix isSupportedFormat for integer frame rate

2014-11-20 16:17:43 -08:00

jni

am d8c169fe: am 0c437fd3: Merge "Add appropriate casts for char16_t."

2014-11-20 23:00:56 +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