OSDN Git Service

Merge "Fix admin policies in managed profiles" into lmp-dev
authorAmith Yamasani <yamasani@google.com>
Wed, 15 Oct 2014 17:44:23 +0000 (17:44 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 15 Oct 2014 17:44:24 +0000 (17:44 +0000)
commit2c3886cb3463ff39c1986c5b85eba79748dd8c24
tree0584fd01dd92f801d97f1fd2f3b11a30426f5275
parent88a6ed5477eb6fa0453f9f29adef4c11b6eeade0
parent242f4b125939276be866bb0a637b89bfbc5aa880
Merge "Fix admin policies in managed profiles" into lmp-dev
core/java/android/app/admin/DevicePolicyManager.java
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java