| commit | f8acd1d8d698f367bc267699a0a84c21f7c7d548 | [log] [tgz] |
|---|---|---|
| author | Selim Cinek <cinek@google.com> | Sat Jul 25 00:33:14 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Sat Jul 25 00:33:14 2015 +0000 |
| tree | 9121c766d45edbd0c6e9b91d64e1d32d8cf67582 | |
| parent | c174de0ab353e2ecaf6e1728e6899bffcfefe48e [diff] | |
| parent | 1fcafc49ad34cb8f778862653d452ac0fe61461c [diff] |
Merge "Adapted the behavior when unlocking with fingerprint is not allowed" into mnc-dev