tree def6349efc0ec463b123c2a7b0f017739c935f14
parent 0e23c2b7da91549546de2c8d14f5f49cd0312781
parent e756d912fe61a5894c686fcee943b3109cf6a5df
author Selim Cinek <cinek@google.com> 1437842177 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437842177 +0000

am e756d912: am d2e40fab: am 8588b331: am f8acd1d8: Merge "Adapted the behavior when unlocking with fingerprint is not allowed" into mnc-dev

* commit 'e756d912fe61a5894c686fcee943b3109cf6a5df':
  Adapted the behavior when unlocking with fingerprint is not allowed