tree c0768ee234189b72339825aecdbf1c41e677b350
parent 3c7e41a6e9c0b190d7a60f0c4f2664d42b7dd3bc
parent d3878b5e124920cc89ef6cb4c7fad68a03b896b8
author Adrian Roos <roosa@google.com> 1500550199 +0000
committer android-build-merger <android-build-merger@google.com> 1500550199 +0000

Merge "Keyguard: Factor out Screen and Wakefulness lifecycles" into oc-dr1-dev
am: d3878b5e12

Change-Id: I11ddc51a8c71d22b5420def8a4c0f3f57954a081