Merge "Revert "Improve interaction around showing / hiding the gear behind notificati...

author Mady Mellor <madym@google.com>

Fri, 11 Mar 2016 23:41:07 +0000 (23:41 +0000)

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

Fri, 11 Mar 2016 23:41:08 +0000 (23:41 +0000)
author Mady Mellor <madym@google.com>
Fri, 11 Mar 2016 23:41:07 +0000 (23:41 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 11 Mar 2016 23:41:08 +0000 (23:41 +0000)
diff --cc packages/SystemUI/src/com/android/systemui/SwipeHelper.java
Simple merge
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
Simple merge
author	Mady Mellor <madym@google.com>
	Fri, 11 Mar 2016 23:41:07 +0000 (23:41 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 11 Mar 2016 23:41:08 +0000 (23:41 +0000)
		1	2
packages/SystemUI/src/com/android/systemui/SwipeHelper.java	patch \|	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java	patch \|	diff1 \|	diff2 \|	blob \| history