OSDN Git Service

Merge "Prevent profile owners from setting certain user restrictions." into lmp-dev
authorJulia Reynolds <juliacr@google.com>
Wed, 20 Aug 2014 20:08:30 +0000 (20:08 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 16 Aug 2014 04:03:42 +0000 (04:03 +0000)
commitafe7a2c9c30393c83304ad0d30a6a32072ba1845
tree64067ff4a84120d0a3034dbb42f2ed1930502546
parent2d268f3508e45ab87f8ced0194595c42daf6e7d5
parent2cb384f42569f36e19ecee60da259d69048fdd85
Merge "Prevent profile owners from setting certain user restrictions." into lmp-dev
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java