am de243eb2: am 55d39ecb: am d74a66bd: Merge "Introduce permission for updating the...

author Bryce Lee <brycelee@google.com>

Mon, 17 Aug 2015 20:16:27 +0000 (20:16 +0000)

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

Mon, 17 Aug 2015 20:16:27 +0000 (20:16 +0000)
author Bryce Lee <brycelee@google.com>
Mon, 17 Aug 2015 20:16:27 +0000 (20:16 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Mon, 17 Aug 2015 20:16:27 +0000 (20:16 +0000)
diff --cc api/system-current.txt
Simple merge
diff --cc core/res/AndroidManifest.xml
Simple merge
author	Bryce Lee <brycelee@google.com>
	Mon, 17 Aug 2015 20:16:27 +0000 (20:16 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Mon, 17 Aug 2015 20:16:27 +0000 (20:16 +0000)
		1	2
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history