Merge "Make notification reply can response to work challenge" into nyc-dev

author Ricky Wai <rickywai@google.com>

Wed, 4 May 2016 10:11:20 +0000 (10:11 +0000)

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

Wed, 4 May 2016 10:11:21 +0000 (10:11 +0000)
author Ricky Wai <rickywai@google.com>
Wed, 4 May 2016 10:11:20 +0000 (10:11 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 4 May 2016 10:11:21 +0000 (10:11 +0000)
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
Simple merge
author	Ricky Wai <rickywai@google.com>
	Wed, 4 May 2016 10:11:20 +0000 (10:11 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 4 May 2016 10:11:21 +0000 (10:11 +0000)