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

* commit 'f062d8d7df6b6ca72f103d133a3483cd91c95c60':
  Unhide secure stop APIs

2014-12-09 00:59:55 +00:00

..

java/android

am f062d8d7: am b15a57d6: am 82cc1c5a: Merge "Unhide secure stop APIs" into lmp-mr1-dev

2014-12-09 00:59:55 +00:00

jni

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

2014-11-25 19:57:42 +00:00

lib

…

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