Jim Miller ce6fb7bba9 am 7ef77271: am bea9d7b9: Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev ...

* commit '7ef772713fac5d7b69874f2b972cdec7a60f074b':
  Reset fingerprint lockout timer when strong auth is used.

2015-08-19 01:32:24 +00:00

..

java

am bea9d7b9: Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev

2015-08-18 23:18:36 +00:00

jni

am 9a010d0a: Merge "Allow debugging only for apps forked from zygote" into mnc-dev

2015-08-18 07:50:06 +00:00

res

am 7ef77271: am bea9d7b9: Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev

2015-08-19 01:32:24 +00:00

tests

Fix check for caller being the active network scorer

2015-08-06 12:53:59 -07:00