am 5b9a5fef: am b3c7ad32: am 7c97a3dd: Merge "Permissions control via profile/device...

author Amith Yamasani <yamasani@google.com>

Wed, 29 Apr 2015 02:25:28 +0000 (02:25 +0000)

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

Wed, 29 Apr 2015 02:25:28 +0000 (02:25 +0000)
author Amith Yamasani <yamasani@google.com>
Wed, 29 Apr 2015 02:25:28 +0000 (02:25 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Wed, 29 Apr 2015 02:25:28 +0000 (02:25 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
author	Amith Yamasani <yamasani@google.com>
	Wed, 29 Apr 2015 02:25:28 +0000 (02:25 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Wed, 29 Apr 2015 02:25:28 +0000 (02:25 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history