| commit | 0b48efaf329bc6d61940fbdeb3b7d430c2bd69be | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Thu Aug 27 22:06:49 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 22:06:49 2015 +0000 |
| tree | fb093942b5e28e4d060efce703a99559685005ef | |
| parent | 2916fa11eea3e119b8f24bea4daa861294951813 [diff] | |
| parent | f094bde15dbbe305d594e11dff5fa22737b93c2c [diff] |
am f094bde1: am c63a12b7: am 6fe373b1: am 16d7245b: Merge "Prevent Fingerprint when SIM is locked" into mnc-dr-dev * commit 'f094bde15dbbe305d594e11dff5fa22737b93c2c': Prevent Fingerprint when SIM is locked