| commit | 1b5cc3a4ba46029b798adb9e362d87df5673bc52 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Thu Sep 03 18:59:37 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Sep 03 18:59:37 2015 +0000 |
| tree | f7eea8dcf091b91feeeca6ac731fd3eeee0dadf0 | |
| parent | 7d223aeef8c9108210e0d13e9458b4d701781ee0 [diff] | |
| parent | e07cbaf53c545fc7176cebfe14096cabb677798a [diff] |
Merge "Show face unlock even when fingerprint is running" into mnc-dr-dev