OSDN Git Service

Merge "Allow profile owner to disable iris/face on personal keyguard" into pi-dev
authorRubin Xu <rubinxu@google.com>
Wed, 9 May 2018 16:06:43 +0000 (16:06 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 9 May 2018 16:06:43 +0000 (16:06 +0000)
commit54a514eda04fe8765ab3e93e5b84b790e21cf179
tree35aada0e767ad35bca1c7d45a8808c5800da1751
parent1822926cfbf55cc68a85cdfd588802f4a106cdb5
parentc418d5adc5ce69d1edd4b35292e8da5e79a17ab9
Merge "Allow profile owner to disable iris/face on personal keyguard" into pi-dev
core/java/android/app/admin/DevicePolicyManager.java