Merge "Enforce cross profile calendar policies in one place."

author Yueming Wang <yuemingw@google.com>

Thu, 31 Jan 2019 19:02:43 +0000 (19:02 +0000)

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

Thu, 31 Jan 2019 19:02:43 +0000 (19:02 +0000)
author Yueming Wang <yuemingw@google.com>
Thu, 31 Jan 2019 19:02:43 +0000 (19:02 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 31 Jan 2019 19:02:43 +0000 (19:02 +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	Yueming Wang <yuemingw@google.com>
	Thu, 31 Jan 2019 19:02:43 +0000 (19:02 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 31 Jan 2019 19:02:43 +0000 (19:02 +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