Merge "Fixed an issue where the shelf could be hidden" into oc-dr1-dev

author Selim Cinek <cinek@google.com>

Mon, 3 Jul 2017 10:46:35 +0000 (10:46 +0000)

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

Mon, 3 Jul 2017 10:46:35 +0000 (10:46 +0000)
author Selim Cinek <cinek@google.com>
Mon, 3 Jul 2017 10:46:35 +0000 (10:46 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 3 Jul 2017 10:46:35 +0000 (10:46 +0000)
diff --cc packages/SystemUI/src/com/android/systemui/qs/QSFragment.java
Simple merge
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
Simple merge
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
Simple merge
author	Selim Cinek <cinek@google.com>
	Mon, 3 Jul 2017 10:46:35 +0000 (10:46 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 3 Jul 2017 10:46:35 +0000 (10:46 +0000)
		1	2
packages/SystemUI/src/com/android/systemui/qs/QSFragment.java	patch \|	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java	patch \|	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java	patch \|	diff1 \|	diff2 \|	blob \| history