OSDN Git Service

Merge "Profile owners on a user can communicate with device owners"
authorEsteban Talavera <etalavera@google.com>
Mon, 30 Jan 2017 11:33:34 +0000 (11:33 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 30 Jan 2017 11:33:38 +0000 (11:33 +0000)
commitb3231029b5642474264b3d574fb7d5b68b0bfc57
tree58eef88beb7bff40951176b995a99ef108652e62
parent1c639f2b9ad73a7cc6acd7c9e1805c689a700db7
parent2f897917fd47c07c11900daf1df75c45154aaff7
Merge "Profile owners on a user can communicate with device owners"
core/java/android/app/admin/DevicePolicyManager.java
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java