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

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

2015-08-19 02:21:58 +00:00

..

java

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

2015-08-19 02:21:58 +00:00

jni

am 60a2716f: am 3244dc22: am 677cd087: am e9de1b4c: am 9a010d0a: Merge "Allow debugging only for apps forked from zygote" into mnc-dev

2015-08-18 09:59:11 +00:00

res

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

2015-08-19 02:21:58 +00:00

tests

Add @SmallTest for continuous tests.

2015-08-18 10:11:07 -07:00