OSDN Git Service

Merge "Keyguard: Factor out Screen and Wakefulness lifecycles" into oc-dr1-dev
authorAdrian Roos <roosa@google.com>
Thu, 20 Jul 2017 11:22:39 +0000 (11:22 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 20 Jul 2017 11:22:39 +0000 (11:22 +0000)
commitd3878b5e124920cc89ef6cb4c7fad68a03b896b8
tree05ba4a14f99d45ba52b6d0ea8eedb954a945dc1e
parent57c60d3b8cc6620184b79c0335f39754f7e5d03c
parent369907f02efd7f25d8063f38ecef6cf65c703572
Merge "Keyguard: Factor out Screen and Wakefulness lifecycles" into oc-dr1-dev
services/core/java/com/android/server/policy/PhoneWindowManager.java