| commit | 7f5ef05b3f0417e863aaac0f663364582f30c626 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Wed Aug 26 01:12:03 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 26 01:12:03 2015 +0000 |
| tree | 38baa2112149cadb8aa087e352f6f88830f961a0 | |
| parent | 3befa6faa3a0644c774242468ac61fb2e7452cdb [diff] | |
| parent | 60aff469b2abd8787ba4c3d326909128b57d06ea [diff] |
am 60aff469: am f90169d1: am 5bc2a2c0: am d56892da: Merge "Disable fingerprint after user lockout" into mnc-dr-dev * commit '60aff469b2abd8787ba4c3d326909128b57d06ea': Disable fingerprint after user lockout