Merge "Add profile policy to set work challenge background color"

author Benjamin Franz <bfranz@google.com>

Fri, 22 Jan 2016 12:59:24 +0000 (12:59 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Fri, 22 Jan 2016 12:59:24 +0000 (12:59 +0000)
author Benjamin Franz <bfranz@google.com>
Fri, 22 Jan 2016 12:59:24 +0000 (12:59 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 22 Jan 2016 12:59:24 +0000 (12:59 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
diff --cc core/java/android/app/admin/DevicePolicyManager.java
Simple merge
diff --cc services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
Simple merge
author	Benjamin Franz <bfranz@google.com>
	Fri, 22 Jan 2016 12:59:24 +0000 (12:59 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 22 Jan 2016 12:59:24 +0000 (12:59 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/app/admin/DevicePolicyManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history