| commit | 5bc2a2c0ce2002f28147bba92abd4de40f8b7f3d | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Wed Aug 26 00:51:02 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 26 00:51:02 2015 +0000 |
| tree | 330fca1963b1688ef95fd4f11fe323788d0d6017 | |
| parent | 388e6854469f4755d763ade46a1915bdb3f93c25 [diff] | |
| parent | d56892da195b183bb5205a0c526bd730fb8a672f [diff] |
am d56892da: Merge "Disable fingerprint after user lockout" into mnc-dr-dev * commit 'd56892da195b183bb5205a0c526bd730fb8a672f': Disable fingerprint after user lockout