Merge "Change default work challenge background color" into nyc-dev

author Clara Bayarri <clarabayarri@google.com>

Wed, 30 Mar 2016 16:12:59 +0000 (16:12 +0000)

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

Wed, 30 Mar 2016 16:13:00 +0000 (16:13 +0000)
author Clara Bayarri <clarabayarri@google.com>
Wed, 30 Mar 2016 16:12:59 +0000 (16:12 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 30 Mar 2016 16:13:00 +0000 (16:13 +0000)
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	Clara Bayarri <clarabayarri@google.com>
	Wed, 30 Mar 2016 16:12:59 +0000 (16:12 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 30 Mar 2016 16:13:00 +0000 (16:13 +0000)
		1	2
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