Merge "Don't animate dim layer exit when recents animation finishes." into pi-dev

author Chavi Weingarten <chaviw@google.com>

Tue, 27 Mar 2018 20:56:17 +0000 (20:56 +0000)

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

Tue, 27 Mar 2018 20:56:17 +0000 (20:56 +0000)
author Chavi Weingarten <chaviw@google.com>
Tue, 27 Mar 2018 20:56:17 +0000 (20:56 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 27 Mar 2018 20:56:17 +0000 (20:56 +0000)
diff --cc services/core/java/com/android/server/wm/RecentsAnimationController.java
Simple merge
diff --cc services/core/java/com/android/server/wm/WindowManagerService.java
Simple merge
author	Chavi Weingarten <chaviw@google.com>
	Tue, 27 Mar 2018 20:56:17 +0000 (20:56 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 27 Mar 2018 20:56:17 +0000 (20:56 +0000)
		1	2
services/core/java/com/android/server/wm/RecentsAnimationController.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/wm/WindowManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history