tree ec881bb8a3994779fd39ed49ff1a3e0d4302cdd0
parent e726dbfa268823330b6304a74180af3f7ff58dfa
parent f3b8fbdd60ef4abebd622e6fb7983fe077baa0a0
author TreeHugger Robot <treehugger-gerrit@google.com> 1494871799 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1494871807 +0000

Merge "Keyguard shouldn't listen to FP if bouncer showing and keyguard dismissing"