OSDN Git Service

am e756d912: am d2e40fab: am 8588b331: am f8acd1d8: Merge "Adapted the behavior when...
authorSelim Cinek <cinek@google.com>
Sat, 25 Jul 2015 16:36:17 +0000 (16:36 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 25 Jul 2015 16:36:17 +0000 (16:36 +0000)
commit25fcf1994c24954d34608ade2ee8fb2212e5e9d1
treedef6349efc0ec463b123c2a7b0f017739c935f14
parent0e23c2b7da91549546de2c8d14f5f49cd0312781
parente756d912fe61a5894c686fcee943b3109cf6a5df
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