tree 8855c9cdc392e0e069c810b5de0aa921cfb9fc67
parent 7b0f661d405a1c53067ec104a6c6ddd7abbae1e6
parent 4eb81345da21efc2b9731cb1969704081064690c
author Adrian Roos <roosa@google.com> 1441308582 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441308582 +0000

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