OSDN Git Service

am 1b5cc3a4: Merge "Show face unlock even when fingerprint is running" into mnc-dr-dev
authorAdrian Roos <roosa@google.com>
Thu, 3 Sep 2015 19:08:58 +0000 (19:08 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 3 Sep 2015 19:08:58 +0000 (19:08 +0000)
commit30a33d17da40964d4efdaafaa9412c70dec4913a
tree6446a3431813c04d00befa58631ae0447af54541
parent238789fa7a50eb272aad0fa9b93a456d5ee250c0
parent1b5cc3a4ba46029b798adb9e362d87df5673bc52
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