OSDN Git Service

Merge "Added an api to uninstall a packge with active DAs" into nyc-dev
authorSuprabh Shukla <suprabh@google.com>
Wed, 10 Feb 2016 22:47:59 +0000 (22:47 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 10 Feb 2016 22:47:59 +0000 (22:47 +0000)
commit338c1d860772edc3101ed4860a149e7f3c5fe493
tree9d247a50e8fcc38b73212847ef9f4e168c0ff095
parentdb338c2e907acb8a93d0519940a1c21125f6db1b
parenta2ae2238e506d5b092015440792d5a885b7a7b1d
Merge "Added an api to uninstall a packge with active DAs" into nyc-dev
core/java/android/app/admin/DevicePolicyManager.java
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java