OSDN Git Service

Merge "Fix KeyguardManager.isSecure() to observe work profile" into nyc-dev
authorJim Miller <jaggies@google.com>
Wed, 11 May 2016 23:45:07 +0000 (23:45 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 11 May 2016 23:45:09 +0000 (23:45 +0000)
commit254d9e4f410f63ed1ba3f917e207731c5d9d6538
tree2e615ec74ba7f4c2562c5b2da7bcd3943fecfa9c
parent3bad687e1ded50502a7dfb385e4cf33bde2c528d
parente4044bb617ea849939058d953e250fcd540c75cc
Merge "Fix KeyguardManager.isSecure() to observe work profile" into nyc-dev
services/core/java/com/android/server/policy/PhoneWindowManager.java