am 6e520470: am 73e74be1: am 63428ccd: Merge "Add a normal permission guarding the...

author Svet Ganov <svetoslavganov@google.com>

Thu, 28 May 2015 17:46:09 +0000 (17:46 +0000)

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

Thu, 28 May 2015 17:46:09 +0000 (17:46 +0000)
author Svet Ganov <svetoslavganov@google.com>
Thu, 28 May 2015 17:46:09 +0000 (17:46 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Thu, 28 May 2015 17:46:09 +0000 (17:46 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc core/res/AndroidManifest.xml
Simple merge
author	Svet Ganov <svetoslavganov@google.com>
	Thu, 28 May 2015 17:46:09 +0000 (17:46 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Thu, 28 May 2015 17:46:09 +0000 (17:46 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history