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

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

2015-08-18 23:18:36 +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 bea9d7b9: Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev

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

tests

Fix check for caller being the active network scorer

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