am 25900c0a: am 82e2dd54: am a2cdeadd: Merge "Rename PROVISIONING_NFC_MIME_TYPE to...

author Esteban Talavera <etalavera@google.com>

Thu, 21 Aug 2014 15:31:58 +0000 (15:31 +0000)

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

Thu, 21 Aug 2014 15:31:58 +0000 (15:31 +0000)
author Esteban Talavera <etalavera@google.com>
Thu, 21 Aug 2014 15:31:58 +0000 (15:31 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Thu, 21 Aug 2014 15:31:58 +0000 (15:31 +0000)
diff --cc api/current.txt
Simple merge
diff --cc core/java/android/app/admin/DevicePolicyManager.java
Simple merge
author	Esteban Talavera <etalavera@google.com>
	Thu, 21 Aug 2014 15:31:58 +0000 (15:31 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Thu, 21 Aug 2014 15:31:58 +0000 (15:31 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/app/admin/DevicePolicyManager.java	patch \|	diff1 \|	diff2 \|	blob \| history