| commit | da2ac5770b67c3696aec9e102ce732b7b632590f | [log] [tgz] |
|---|---|---|
| author | Selim Cinek <cinek@google.com> | Sat Jul 25 16:47:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jul 25 16:47:40 2015 +0000 |
| tree | 0c752da68cd70ea2d07ef41b5ffdc01f78ca4e91 | |
| parent | f1518541766237fe2e182026955abbe5142103f0 [diff] | |
| parent | 25fcf1994c24954d34608ade2ee8fb2212e5e9d1 [diff] |
am 25fcf199: am e756d912: am d2e40fab: am 8588b331: am f8acd1d8: Merge "Adapted the behavior when unlocking with fingerprint is not allowed" into mnc-dev * commit '25fcf1994c24954d34608ade2ee8fb2212e5e9d1': Adapted the behavior when unlocking with fingerprint is not allowed