Merge "AOD: Delay wakeup until interaction with notification"

author Adrian Roos <roosa@google.com>

Tue, 24 Jan 2017 19:06:11 +0000 (19:06 +0000)

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

Tue, 24 Jan 2017 19:06:14 +0000 (19:06 +0000)
author Adrian Roos <roosa@google.com>
Tue, 24 Jan 2017 19:06:11 +0000 (19:06 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 24 Jan 2017 19:06:14 +0000 (19:06 +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
author	Adrian Roos <roosa@google.com>
	Tue, 24 Jan 2017 19:06:11 +0000 (19:06 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 24 Jan 2017 19:06:14 +0000 (19:06 +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