tree 9121c766d45edbd0c6e9b91d64e1d32d8cf67582
parent c174de0ab353e2ecaf6e1728e6899bffcfefe48e
parent 1fcafc49ad34cb8f778862653d452ac0fe61461c
author Selim Cinek <cinek@google.com> 1437784394 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1437784394 +0000

Merge "Adapted the behavior when unlocking with fingerprint is not allowed" into mnc-dev