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