| commit | 2b325373dc447a3b3eb2dd3c165ec49236713f81 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Thu Jul 20 11:52:36 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 20 11:52:36 2017 +0000 |
| tree | 0d7f5ce7920e067a992c669b145033d3c6078e20 | |
| parent | 68e982a5ca6b41a8edfdbef83dab340b48d602d7 [diff] | |
| parent | 5d39df803d26915b89fb17613830af149824c8dc [diff] |
Merge "Merge "Keyguard: Factor out Screen and Wakefulness lifecycles" into oc-dr1-dev am: d3878b5e12 am: 41234fdc6c" into oc-mr1-dev-plus-aosp am: 5d39df803d Change-Id: Ie11d9ffac98f97b5a36934eb6d075e3e5c84c723