Jeff Tinker f062d8d7df am b15a57d6: am 82cc1c5a: Merge "Unhide secure stop APIs" into lmp-mr1-dev ...

* commit 'b15a57d64d39315a9c1331d74a1ff5821f8b14d1':
  Unhide secure stop APIs

2014-12-08 19:35:59 +00:00

..

java/android

Unhide secure stop APIs

2014-12-05 15:44:17 -08:00

jni

am 3ec380d3: am fc545733: Merge "Remove unused variables and functions, don\'t warn about unused parameters"

2014-11-25 19:04:05 +00:00

lib

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

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

mca

Merge "Add -Wno-unused-parameter to LOCAL_CFLAGS"

2014-12-04 01:04:09 +00:00

tests

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

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