| commit | 29b48c22e17b24149c891719bb9b481228a2dde0 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Tue Jul 07 23:21:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 07 23:21:47 2015 +0000 |
| tree | d819b2202c96a1381a6cef99463f719ef994c847 | |
| parent | 6b27136de3639a21c17124eceb39b34aba10517a [diff] | |
| parent | 412733811c34d8b581b8fcded130072cbb34e184 [diff] |
am 41273381: am 1075a27c: am b5e3eba1: Merge "SystemUI/Keyguard: try authenticate finger after authentication failure" into mnc-dev * commit '412733811c34d8b581b8fcded130072cbb34e184': SystemUI/Keyguard: try authenticate finger after authentication failure