Merge "Fix header not set on initialization" into oc-dev am: 388ceaa37a

author Lucas Dupin <dupin@google.com>

Wed, 31 May 2017 16:17:19 +0000 (16:17 +0000)

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

Wed, 31 May 2017 16:17:19 +0000 (16:17 +0000)
author Lucas Dupin <dupin@google.com>
Wed, 31 May 2017 16:17:19 +0000 (16:17 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 31 May 2017 16:17:19 +0000 (16:17 +0000)
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationChildrenContainer.java
Simple merge
diff --cc packages/SystemUI/tests/src/com/android/systemui/statusbar/stack/NotificationChildrenContainerTest.java
Simple merge
author	Lucas Dupin <dupin@google.com>
	Wed, 31 May 2017 16:17:19 +0000 (16:17 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 31 May 2017 16:17:19 +0000 (16:17 +0000)
		1	2
packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationChildrenContainer.java	patch \|	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/tests/src/com/android/systemui/statusbar/stack/NotificationChildrenContainerTest.java	patch \|	diff1 \|	diff2 \|	blob \| history