| commit | 4008702700b9e14c756d453deb3bdfaff9138e92 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Thu Sep 03 19:29:42 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 03 19:29:42 2015 +0000 |
| tree | 8855c9cdc392e0e069c810b5de0aa921cfb9fc67 | |
| parent | 7b0f661d405a1c53067ec104a6c6ddd7abbae1e6 [diff] | |
| parent | 4eb81345da21efc2b9731cb1969704081064690c [diff] |
am 4eb81345: am b90f1de2: am 1b5cc3a4: Merge "Show face unlock even when fingerprint is running" into mnc-dr-dev * commit '4eb81345da21efc2b9731cb1969704081064690c': Show face unlock even when fingerprint is running