OSDN Git Service

Merge \\"Add hidden API to store whether provisioning config has been applied\\"...
authorBenjamin Franz <bfranz@google.com>
Wed, 13 Jul 2016 14:42:22 +0000 (14:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 13 Jul 2016 14:42:22 +0000 (14:42 +0000)
commite4da41e6be7b6cc5d2f26d1c24910785d04c751c
tree552a7cbf0fe89c2911f7e2ec146edb1ab49ac99d
parentf84e7822d75ed85b18e0f604146b103d3bc6a76e
parentb3fa8d87e0b1ed184b449de4ec06f786820e40af
Merge \\"Add hidden API to store whether provisioning config has been applied\\" into nyc-mr1-dev am: 17ca90430b
am: b3fa8d87e0

Change-Id: If65317cf6ec5237cff36fba86ed219ab078776ad
core/java/android/app/admin/DevicePolicyManager.java
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java