OSDN Git Service

Merge "Allowing profile to set a subset of keyguard restrictions." into mnc-dev
authorKenny Guy <kennyguy@google.com>
Wed, 13 May 2015 21:07:15 +0000 (21:07 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 13 May 2015 21:07:17 +0000 (21:07 +0000)
commit467eb0566ff1df320c9a9be3da0f44ee3d6bc9fa
treeb2cbcd7ca8f3389e9e2ca1055d0770bd7b39149a
parentd7fd045014b746a9822a66390288f44b63e4dc2f
parent0b7dd1e6c8422da0a21c1631244bec7a2af5085a
Merge "Allowing profile to set a subset of keyguard restrictions." into mnc-dev
core/java/android/app/admin/DevicePolicyManager.java
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java