Merge "Pass ComponentName to probing certificate methods" into lmp-dev

author Esteban Talavera <etalavera@google.com>

Wed, 3 Sep 2014 17:22:39 +0000 (17:22 +0000)

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

Wed, 3 Sep 2014 17:22:41 +0000 (17:22 +0000)
author Esteban Talavera <etalavera@google.com>
Wed, 3 Sep 2014 17:22:39 +0000 (17:22 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 3 Sep 2014 17:22:41 +0000 (17:22 +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>
	Wed, 3 Sep 2014 17:22:39 +0000 (17:22 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 3 Sep 2014 17:22:41 +0000 (17:22 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/app/admin/DevicePolicyManager.java	patch \|	diff1 \|	diff2 \|	blob \| history