summaryrefslogtreecommitdiffstats
path: root/sax
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2015-08-18 23:18:36 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-18 23:18:36 +0000
commit7ef772713fac5d7b69874f2b972cdec7a60f074b (patch)
treed50e3669c2ebd2f42898b30f15fae1c279ced538 /sax
parent2591d6ffc60505df0099069877f7913ec30e4460 (diff)
parentbea9d7b94cfa16da8f257ed705e218b017d459a7 (diff)
downloadframeworks_base-7ef772713fac5d7b69874f2b972cdec7a60f074b.zip
frameworks_base-7ef772713fac5d7b69874f2b972cdec7a60f074b.tar.gz
frameworks_base-7ef772713fac5d7b69874f2b972cdec7a60f074b.tar.bz2
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.
Diffstat (limited to 'sax')
0 files changed, 0 insertions, 0 deletions