OSDN Git Service

Merge "Implement DISALLOW_SHARE_INTO_MANAGED_PROFILE"
authorTreeHugger Robot <treehugger-gerrit@google.com>
Sat, 13 Jan 2018 16:40:41 +0000 (16:40 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 13 Jan 2018 16:40:41 +0000 (16:40 +0000)
commit82548f4bc32cab54fd8f3959c245659b8e04cae2
tree5d44a55a74c503f4129d22a2ecc65727f4396d6b
parent98fe2bcaeef65c4eb30d880da408d9c96efd42d3
parentcc391c2c13b30c494908309659509f8426af48ea
Merge "Implement DISALLOW_SHARE_INTO_MANAGED_PROFILE"
api/current.txt
api/test-current.txt
core/java/android/os/UserManager.java
core/res/AndroidManifest.xml
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java