| commit | 530658fc86017042cc907c956ee95bd9eaf560f9 | [log] [tgz] |
|---|---|---|
| author | Kevin Chyn <kchyn@google.com> | Mon May 15 21:04:59 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon May 15 21:04:59 2017 +0000 |
| tree | b549b54811f73f1388f8cc2335348ecaf15e055c | |
| parent | 7780b9bcede3bb91ddd6d5decf3e92bf5cf95fb8 [diff] | |
| parent | 4be9b2ca3eb18bfbe00be853721ee804105cd247 [diff] |
Merge "Keyguard shouldn't listen to FP if bouncer showing and keyguard dismissing" into oc-dev am: 4be9b2ca3e Change-Id: Icc4dcc08a2cc62872ae1b017ebf5c724a7003336