OSDN Git Service

Merge "Allow privileged apps to set the organization color." into nyc-dev
authorNicolas Prévot <nprevot@google.com>
Mon, 15 Feb 2016 10:47:40 +0000 (10:47 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 15 Feb 2016 10:47:41 +0000 (10:47 +0000)
commiteff90bd5ff6bd50325149a5010183277bd76f4c6
tree17d5c10f65e492d06c66479d5ee590bfef183f18
parent3e425f6c4be3fc30695473329c6364abfe69a059
parent8f7698aaf630787693ec7edb4779a27fdd2b888b
Merge "Allow privileged apps to set the organization color." into nyc-dev
core/java/android/app/admin/DevicePolicyManager.java
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java