Wei Wang 1b09c97d8a am 4447405d: Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev ...

* commit '4447405d76b5a9152aacadbfdefd1f8fd60a03ad':
  Callback on correct method when status is unsuccessful.

2014-03-29 01:57:31 +00:00

..

java

am 4447405d: Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev

2014-03-29 01:57:31 +00:00

jni

resolved conflicts for merge of eaab4df0 to klp-modular-dev-plus-aosp

2014-03-27 12:50:58 +00:00

res

am f10d0399: Made secure-adb\'s new-public-key activity configurable. Some devices do not have lockscreens themselves, so the plan is to have them do RPCs to companion devices that can have lockscreens, for allowing or rejecting unwhitelisted adb public keys.

2014-03-28 23:03:56 +00:00

tests

am 560e7541: am 1b007565: am 9b650702: Merge "Fix state transition verification." into klp-dev

2014-03-18 22:34:17 +00:00