resolve merge conflicts of ad4aa1ce7d3d to nyc-mr1-dev am: eb35ad9969

author Andrew Scull <ascull@google.com>

Fri, 13 Jan 2017 21:16:31 +0000 (21:16 +0000)

committer android-build-merger <android-build-merger@google.com>

Fri, 13 Jan 2017 21:16:31 +0000 (21:16 +0000)
author Andrew Scull <ascull@google.com>
Fri, 13 Jan 2017 21:16:31 +0000 (21:16 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 13 Jan 2017 21:16:31 +0000 (21:16 +0000)
diff --cc core/java/android/app/admin/DevicePolicyManager.java
Simple merge
diff --cc core/java/android/app/admin/IDevicePolicyManager.aidl
Simple merge
diff --cc services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
Simple merge
author	Andrew Scull <ascull@google.com>
	Fri, 13 Jan 2017 21:16:31 +0000 (21:16 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 13 Jan 2017 21:16:31 +0000 (21:16 +0000)
		1	2
core/java/android/app/admin/DevicePolicyManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/app/admin/IDevicePolicyManager.aidl	patch \|	diff1 \|	diff2 \|	blob \| history
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history