OSDN Git Service

Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev
authorJim Miller <jaggies@google.com>
Tue, 18 Aug 2015 23:12:18 +0000 (23:12 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 18 Aug 2015 23:12:18 +0000 (23:12 +0000)
commitbea9d7b94cfa16da8f257ed705e218b017d459a7
tree4001e51e4844be07fb7e8f037413f5bfc5806a4e
parent358fcc795ea567ba086a460c587de427507fefdd
parente0507bbbf95ae6d958c900f32122baf078d47d71
Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev
packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java