| commit | 1e0ef00ddc7d2424e2a9d24b5cb9d28cf4fe1075 | [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 | 41234fdc6c09dd7815dbeae2ee1b3ad709bb971d [diff] |
Merge "Keyguard: Factor out Screen and Wakefulness lifecycles" into oc-dr1-dev am: d3878b5e12 am: 41234fdc6c Change-Id: I65b7d753348403be479a556e6b0d201ea363a982