Merge "AOD: Fix wakeup transition jank" into oc-dr1-dev

author Adrian Roos <roosa@google.com>

Thu, 27 Jul 2017 17:23:00 +0000 (17:23 +0000)

committer android-build-merger <android-build-merger@google.com>

Thu, 27 Jul 2017 17:23:00 +0000 (17:23 +0000)
author Adrian Roos <roosa@google.com>
Thu, 27 Jul 2017 17:23:00 +0000 (17:23 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 27 Jul 2017 17:23:00 +0000 (17:23 +0000)
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
Simple merge
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
Simple merge
author	Adrian Roos <roosa@google.com>
	Thu, 27 Jul 2017 17:23:00 +0000 (17:23 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 27 Jul 2017 17:23:00 +0000 (17:23 +0000)
		1	2
packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java	patch \|	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java	patch \|	diff1 \|	diff2 \|	blob \| history