OSDN Git Service

Merge "Add explicit and persistent user provisioning state."
authorAlan Treadway <alantreadway@google.com>
Tue, 26 Jan 2016 09:59:40 +0000 (09:59 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 26 Jan 2016 09:59:40 +0000 (09:59 +0000)
commit44a18081546345a0655748717862a89ae6dd7948
treed32fbe357c2212c15f361d37f15228bf9c0a86a0
parent65630250065f822ea92c4798a3113d50e3d82f8c
parentafad8783699b1ba6f3c7ee5961d6ddc2bd771dc1
Merge "Add explicit and persistent user provisioning state."
core/java/android/app/admin/DevicePolicyManager.java
core/java/android/app/admin/IDevicePolicyManager.aidl
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java