Merge "DPM: API review for installKeyPair" into pi-dev

author Eran Messeri <eranm@google.com>

Thu, 29 Mar 2018 15:00:30 +0000 (15:00 +0000)

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

Thu, 29 Mar 2018 15:00:30 +0000 (15:00 +0000)
author Eran Messeri <eranm@google.com>
Thu, 29 Mar 2018 15:00:30 +0000 (15:00 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 29 Mar 2018 15:00:30 +0000 (15:00 +0000)
diff --cc api/current.txt
Simple merge
diff --cc core/java/android/app/admin/DevicePolicyManager.java
Simple merge
author	Eran Messeri <eranm@google.com>
	Thu, 29 Mar 2018 15:00:30 +0000 (15:00 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 29 Mar 2018 15:00:30 +0000 (15:00 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/app/admin/DevicePolicyManager.java	patch \|	diff1 \|	diff2 \|	blob \| history