Merge "Zen: Simplify notification policy api, add zenmode api." into mnc-dev

author John Spurlock <jspurlock@google.com>

Fri, 8 May 2015 22:28:49 +0000 (22:28 +0000)

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

Fri, 8 May 2015 22:28:51 +0000 (22:28 +0000)
author John Spurlock <jspurlock@google.com>
Fri, 8 May 2015 22:28:49 +0000 (22:28 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 8 May 2015 22:28:51 +0000 (22:28 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
author	John Spurlock <jspurlock@google.com>
	Fri, 8 May 2015 22:28:49 +0000 (22:28 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 8 May 2015 22:28:51 +0000 (22:28 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history