| commit | e6da9bb7c6e4eef6ccb09325ba1a7b19c0c4809f | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Tue Sep 01 16:08:26 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 01 16:08:26 2015 +0000 |
| tree | 3db88ade8bf8e74ad0a69fdb07f502d60373712c | |
| parent | 87b4b53b53b199edc4193d03e542515e3cc55584 [diff] | |
| parent | e803c9ed7f1ae5f31f041e7c6ce14d91965b7ada [diff] |
am e803c9ed: am 9cb060d0: am 7e1775d2: am 78195312: Merge "Disable fingerprint after force lock" into mnc-dr-dev * commit 'e803c9ed7f1ae5f31f041e7c6ce14d91965b7ada': Disable fingerprint after force lock