Merge "Zen: Enter alarms only on volume down from vibrate."

author John Spurlock <jspurlock@google.com>

Tue, 14 Apr 2015 20:00:40 +0000 (20:00 +0000)

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

Tue, 14 Apr 2015 20:00:42 +0000 (20:00 +0000)
author John Spurlock <jspurlock@google.com>
Tue, 14 Apr 2015 20:00:40 +0000 (20:00 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 14 Apr 2015 20:00:42 +0000 (20:00 +0000)
diff --cc packages/SystemUI/src/com/android/systemui/volume/VolumeDialogComponent.java
Simple merge
diff --cc packages/SystemUI/src/com/android/systemui/volume/ZenFooter.java
Simple merge
author	John Spurlock <jspurlock@google.com>
	Tue, 14 Apr 2015 20:00:40 +0000 (20:00 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 14 Apr 2015 20:00:42 +0000 (20:00 +0000)
		1	2
packages/SystemUI/src/com/android/systemui/volume/VolumeDialogComponent.java	patch \|	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/src/com/android/systemui/volume/ZenFooter.java	patch \|	diff1 \|	diff2 \|	blob \| history