| commit | 68e982a5ca6b41a8edfdbef83dab340b48d602d7 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Thu Jul 20 11:43:12 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 20 11:43:12 2017 +0000 |
| tree | 0d7f5ce7920e067a992c669b145033d3c6078e20 | |
| parent | e005940a172ac1376597d34b3666dec5b0a4663e [diff] | |
| parent | 90e78fd304cd5fe3a3cd623d7930d4a743472ffe [diff] |
Merge "Keyguard: Factor out Screen and Wakefulness lifecycles" into oc-dr1-dev am: d3878b5e12 am: 520caf4a75 am: 90e78fd304 Change-Id: Ibd11cf8c7c84ebec034760f8e0fc44324617b9ee