| commit | 4be9b2ca3eb18bfbe00be853721ee804105cd247 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon May 15 20:52:21 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon May 15 20:52:28 2017 +0000 |
| tree | d1e48d68cdba9873fdc71da94df76182006417e6 | |
| parent | 4b2cecbb53aaa74c506ea0b318ede05f84756843 [diff] | |
| parent | 6db7d5fc84ae67cc0d11b0cd376b5cf21a1fafd3 [diff] |
Merge "Keyguard shouldn't listen to FP if bouncer showing and keyguard dismissing" into oc-dev