| commit | 8588b3317c848e93998616c981f8c997197b4222 | [log] [tgz] |
|---|---|---|
| author | Selim Cinek <cinek@google.com> | Sat Jul 25 00:59:57 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jul 25 00:59:57 2015 +0000 |
| tree | 8d25a99898f1d1d02088bef287fffa6c1a95be0c | |
| parent | 67b4db0c5401ab81359fe145efcc91173154cae8 [diff] | |
| parent | f8acd1d8d698f367bc267699a0a84c21f7c7d548 [diff] |
am f8acd1d8: Merge "Adapted the behavior when unlocking with fingerprint is not allowed" into mnc-dev * commit 'f8acd1d8d698f367bc267699a0a84c21f7c7d548': Adapted the behavior when unlocking with fingerprint is not allowed