am 31f19c44: Merge "Send next alarm\'s show intent via PendingIntent" into mnc-dev

author Adrian Roos <roosa@google.com>

Thu, 15 Oct 2015 00:35:33 +0000 (00:35 +0000)

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

Thu, 15 Oct 2015 00:35:33 +0000 (00:35 +0000)
author Adrian Roos <roosa@google.com>
Thu, 15 Oct 2015 00:35:33 +0000 (00:35 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Thu, 15 Oct 2015 00:35:33 +0000 (00:35 +0000)
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
Simple merge
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
Simple merge
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java
Simple merge
author	Adrian Roos <roosa@google.com>
	Thu, 15 Oct 2015 00:35:33 +0000 (00:35 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Thu, 15 Oct 2015 00:35:33 +0000 (00:35 +0000)
		1	2
packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java	patch \|	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java	patch \|	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java	patch \|	diff1 \|	diff2 \|	blob \| history