| commit | f90169d12b9654630740cd649b177c3bd6685190 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Wed Aug 26 00:59:09 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 26 00:59:09 2015 +0000 |
| tree | 666e0fea0aa3d42e1b469689a142537c46f8d2ef | |
| parent | 742184528ba15d16d07e375129260856c0633073 [diff] | |
| parent | 5bc2a2c0ce2002f28147bba92abd4de40f8b7f3d [diff] |
am 5bc2a2c0: am d56892da: Merge "Disable fingerprint after user lockout" into mnc-dr-dev * commit '5bc2a2c0ce2002f28147bba92abd4de40f8b7f3d': Disable fingerprint after user lockout