| commit | 25fcf1994c24954d34608ade2ee8fb2212e5e9d1 | [log] [tgz] |
|---|---|---|
| author | Selim Cinek <cinek@google.com> | Sat Jul 25 16:36:17 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jul 25 16:36:17 2015 +0000 |
| tree | def6349efc0ec463b123c2a7b0f017739c935f14 | |
| parent | 0e23c2b7da91549546de2c8d14f5f49cd0312781 [diff] | |
| parent | e756d912fe61a5894c686fcee943b3109cf6a5df [diff] |
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