OSDN Git Service

Merge "Adds an enabled state in UserInfo instead of DevicePolicyManager"
authorAlexandra Gherghina <alexgherghina@google.com>
Thu, 1 May 2014 10:49:21 +0000 (10:49 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 1 May 2014 10:49:21 +0000 (10:49 +0000)
commit3c4d9c56db5b24699956de0a5a841196185363cc
treeccbfaf6ddcdfec78f23262150db16f171ea82efe
parent8596f6998eddb0caa35532eb386ac6d00f81551d
parentdf35d570ed25257c6782e632ab1bae5e1603855a
Merge "Adds an enabled state in UserInfo instead of DevicePolicyManager"
core/java/android/app/admin/DevicePolicyManager.java
core/java/android/app/admin/IDevicePolicyManager.aidl
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java