am b060f018: am 91aa1bdb: am 19847b07: am b46e4806: Merge "Remove TrustAgent whitelis...

author Jim Miller <jaggies@google.com>

Wed, 25 Feb 2015 18:30:10 +0000 (18:30 +0000)

committer Android Git Automerger <android-git-automerger@android.com>

Wed, 25 Feb 2015 18:30:10 +0000 (18:30 +0000)
author Jim Miller <jaggies@google.com>
Wed, 25 Feb 2015 18:30:10 +0000 (18:30 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Wed, 25 Feb 2015 18:30:10 +0000 (18:30 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc core/java/android/app/admin/DevicePolicyManager.java
Simple merge
author	Jim Miller <jaggies@google.com>
	Wed, 25 Feb 2015 18:30:10 +0000 (18:30 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Wed, 25 Feb 2015 18:30:10 +0000 (18:30 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/app/admin/DevicePolicyManager.java	patch \|	diff1 \|	diff2 \|	blob \| history