| commit | e803c9ed7f1ae5f31f041e7c6ce14d91965b7ada | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Mon Aug 31 20:40:54 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 31 20:40:54 2015 +0000 |
| tree | 02009314af0cc2c420f0574a828d02520f928bf9 | |
| parent | 937b0978be5cda5ab4e12bc277dad42cde0e27b6 [diff] | |
| parent | 9cb060d0c314630f6af89677263233f3253ad847 [diff] |
am 9cb060d0: am 7e1775d2: am 78195312: Merge "Disable fingerprint after force lock" into mnc-dr-dev * commit '9cb060d0c314630f6af89677263233f3253ad847': Disable fingerprint after force lock