| commit | b90f1de216ec8be27eebd17b5f3c6a87ee084e75 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Thu Sep 03 19:08:53 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 03 19:08:53 2015 +0000 |
| tree | 8d9dd08a8a023c5fc15234b2d4112fdf71215b69 | |
| parent | cb92577aa6201abbba2d2f17c8cc8d99d9754e8b [diff] | |
| parent | 1b5cc3a4ba46029b798adb9e362d87df5673bc52 [diff] |
am 1b5cc3a4: Merge "Show face unlock even when fingerprint is running" into mnc-dr-dev * commit '1b5cc3a4ba46029b798adb9e362d87df5673bc52': Show face unlock even when fingerprint is running