tree 008354df97ee34ba84e19b743a05b7338430efb7
parent 95200e6f4eb34818ac0b652167cffacfcfb4fdff
parent af4ab3e2d3665c72889bf2337c744eca6c7d5e86
author Adrian Roos <roosa@google.com> 1441309359 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1441309359 +0000

Merge "Don't disable fingerprint when entering wrong credential" into mnc-dr-dev