| commit | f094bde15dbbe305d594e11dff5fa22737b93c2c | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Thu Aug 27 18:31:31 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 18:31:31 2015 +0000 |
| tree | 8c01a112f37f6f94a4f3aa216802227f358f2891 | |
| parent | 88b579a1ac912aa00ddf82afb059cda8ff47f732 [diff] | |
| parent | c63a12b78c364a17399ce99f7f74fab8b4b03b38 [diff] |
am c63a12b7: am 6fe373b1: am 16d7245b: Merge "Prevent Fingerprint when SIM is locked" into mnc-dr-dev * commit 'c63a12b78c364a17399ce99f7f74fab8b4b03b38': Prevent Fingerprint when SIM is locked