OSDN Git Service

Merge "xxxTrustAgentConfiguration should be supported in the parent DPM instance...
authorTony Mak <tonymak@google.com>
Wed, 6 Apr 2016 18:39:20 +0000 (18:39 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 6 Apr 2016 18:39:21 +0000 (18:39 +0000)
commita01c1f0d90def31de9bdd21bada11a3dfc0444b0
tree1106a6ad34a7e3eaf2d6dc94a310e428e7c64791
parent8da25ef74afaa63e1ba2814f219c0d0bac2abf7e
parent089d840383c511ed170a284ba343bd9a00db790e
Merge "xxxTrustAgentConfiguration should be supported in the parent DPM instance" into nyc-dev
core/java/android/app/admin/DevicePolicyManager.java
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java