Narayan Kamath a6f7099343 am 031acc4b: am 3787decd: am 5137415e: Merge "Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod." ...

* commit '031acc4b3920336e58c56abb99322cbeb9be9e5c':
  Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod.

2015-01-06 20:09:12 +00:00

..

java/android

Merge "Fix build"

2014-12-29 19:08:48 +00:00

jni

am 031acc4b: am 3787decd: am 5137415e: Merge "Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod."

2015-01-06 20:09:12 +00:00

lib

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

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

mca

Cleanup Obsolete LOCAL_PRELINK_MODULE.

2014-12-16 12:45:49 -08:00

tests

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

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