tree 1468f1ca01c3c8c6f213e4a8e9e222d7ab1f913e
parent 1b5cc3a4ba46029b798adb9e362d87df5673bc52
parent f6d51acec69366b6ea34f5e0c9aa8cc840f04a4d
author Adrian Roos <roosa@google.com> 1441309282 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1441309282 +0000

Merge "Poke fingerprint timeout when vold password is correct" into mnc-dr-dev