Merge "Add metadata to validate incoming administrator during transfer of ownership."

author Antoan Angelov <arangelov@google.com>

Wed, 17 Jan 2018 21:32:15 +0000 (21:32 +0000)

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

Wed, 17 Jan 2018 21:32:15 +0000 (21:32 +0000)
author Antoan Angelov <arangelov@google.com>
Wed, 17 Jan 2018 21:32:15 +0000 (21:32 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 17 Jan 2018 21:32:15 +0000 (21:32 +0000)
diff --cc api/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	Antoan Angelov <arangelov@google.com>
	Wed, 17 Jan 2018 21:32:15 +0000 (21:32 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 17 Jan 2018 21:32:15 +0000 (21:32 +0000)
		1	2
api/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