| commit | 7e1775d246371422ae60ec4d825d70bc067a8962 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Mon Aug 31 20:16:57 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 31 20:16:57 2015 +0000 |
| tree | 6932df6c55592996b56eb5214565dfade963557b | |
| parent | 02be93160a246323f0a17f831e4e8bf56d65d415 [diff] | |
| parent | 781953123e5b0f0f85691eabc13b3430c3054a10 [diff] |
am 78195312: Merge "Disable fingerprint after force lock" into mnc-dr-dev * commit '781953123e5b0f0f85691eabc13b3430c3054a10': Disable fingerprint after force lock