OSDN Git Service

Merge "Disable multiple user for corp-liable mode"
authorMahaver Chopra <mahaver@google.com>
Mon, 23 Nov 2015 10:07:43 +0000 (10:07 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 23 Nov 2015 10:07:43 +0000 (10:07 +0000)
commit71c84e515e73f6a3cb30d68fc81f88e1bd02b5e3
treece12d9dc13af3b37ff89b4e67574e4d7fb4aee80
parent51852b890b541f6b818a765b71bb5c2247ee85da
parent1dc510eb5bc7f279002a3479f24761f08cc390f7
Merge "Disable multiple user for corp-liable mode"
core/java/android/app/admin/DevicePolicyManager.java
core/java/android/app/admin/IDevicePolicyManager.aidl
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java