OSDN Git Service

Merge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Fri, 11 Aug 2017 17:26:07 +0000 (17:26 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 11 Aug 2017 17:26:07 +0000 (17:26 +0000)
commit60409a925574c2e1e6572f92d1c24a37e86443f7
tree811a698b6ef650ccdb57a8d1847a5d28b58e490b
parent2593d707f78e72afa3fdbe98557497af0545ded3
parent4dc098aed14cf42a343932d2074025e8caf16feb
Merge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
services/core/java/com/android/server/locksettings/LockSettingsService.java