| commit | 559ccc12350ea5ffd173d814fc490aaa94caee36 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Wed Jul 08 01:38:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 08 01:38:38 2015 +0000 |
| tree | df8b43d195456d6692bdced61715b45ca8845632 | |
| parent | f3ab9b0b9aa759635d19e983c3ddc208eab3e513 [diff] | |
| parent | 29b48c22e17b24149c891719bb9b481228a2dde0 [diff] |
am 29b48c22: am 41273381: am 1075a27c: am b5e3eba1: Merge "SystemUI/Keyguard: try authenticate finger after authentication failure" into mnc-dev * commit '29b48c22e17b24149c891719bb9b481228a2dde0': SystemUI/Keyguard: try authenticate finger after authentication failure