Merge "Minimal change to ensure events are propagated to the right DividerView."...

author Winson Chung <winsonc@google.com>

Tue, 13 Jun 2017 01:45:31 +0000 (01:45 +0000)

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

Tue, 13 Jun 2017 01:45:31 +0000 (01:45 +0000)
author Winson Chung <winsonc@google.com>
Tue, 13 Jun 2017 01:45:31 +0000 (01:45 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 13 Jun 2017 01:45:31 +0000 (01:45 +0000)
diff --cc packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java
Simple merge
diff --cc packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java
Simple merge
author	Winson Chung <winsonc@google.com>
	Tue, 13 Jun 2017 01:45:31 +0000 (01:45 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 13 Jun 2017 01:45:31 +0000 (01:45 +0000)
		1	2
packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java	patch \|	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java	patch \|	diff1 \|	diff2 \|	blob \| history