Merge "Fixed some issues with fullscreen dimming" into nyc-dev

author TreeHugger Robot <treehugger-gerrit@google.com>

Fri, 13 May 2016 20:42:20 +0000 (20:42 +0000)

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

Fri, 13 May 2016 20:42:21 +0000 (20:42 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Fri, 13 May 2016 20:42:20 +0000 (20:42 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 13 May 2016 20:42:21 +0000 (20:42 +0000)
diff --cc services/core/java/com/android/server/wm/DockedStackDividerController.java
Simple merge
diff --cc services/core/java/com/android/server/wm/TaskStack.java
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Fri, 13 May 2016 20:42:20 +0000 (20:42 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 13 May 2016 20:42:21 +0000 (20:42 +0000)
		1	2
services/core/java/com/android/server/wm/DockedStackDividerController.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/wm/TaskStack.java	patch \|	diff1 \|	diff2 \|	blob \| history