| commit | 90e78fd304cd5fe3a3cd623d7930d4a743472ffe | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Thu Jul 20 11:36:00 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 20 11:36:00 2017 +0000 |
| tree | e80ef3f5a91180c5d73e78a6e71a6de3a4026443 | |
| parent | fc337a7e29509548937af94c7c834e1884cfaa49 [diff] | |
| parent | 520caf4a75ae374a96e7893b60b3533dfb2224a4 [diff] |
Merge "Keyguard: Factor out Screen and Wakefulness lifecycles" into oc-dr1-dev am: d3878b5e12 am: 520caf4a75 Change-Id: I1dd6043af695b882612d17d8bbd7ca8195c960d4