Merge "Make permission RECEIVE_EMERGENCY_BROADCAST public."

author Amit Mahajan <amitmahajan@google.com>

Mon, 8 Feb 2016 22:17:28 +0000 (22:17 +0000)

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

Mon, 8 Feb 2016 22:17:28 +0000 (22:17 +0000)
author Amit Mahajan <amitmahajan@google.com>
Mon, 8 Feb 2016 22:17:28 +0000 (22:17 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 8 Feb 2016 22:17:28 +0000 (22:17 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
diff --cc core/res/AndroidManifest.xml
Simple merge
author	Amit Mahajan <amitmahajan@google.com>
	Mon, 8 Feb 2016 22:17:28 +0000 (22:17 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 8 Feb 2016 22:17:28 +0000 (22:17 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history