| commit | 4eb81345da21efc2b9731cb1969704081064690c | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Thu Sep 03 19:17:36 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 03 19:17:36 2015 +0000 |
| tree | dd7039b91603afb5100827920b7342e19bcc6d11 | |
| parent | 1635e8182ad51c1085e608dea6d9ef470747f759 [diff] | |
| parent | b90f1de216ec8be27eebd17b5f3c6a87ee084e75 [diff] |
am b90f1de2: am 1b5cc3a4: Merge "Show face unlock even when fingerprint is running" into mnc-dr-dev * commit 'b90f1de216ec8be27eebd17b5f3c6a87ee084e75': Show face unlock even when fingerprint is running