Merge "Added animations to dim layers"

author Chavi Weingarten <chaviw@google.com>

Tue, 30 Jan 2018 00:19:27 +0000 (00:19 +0000)

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

Tue, 30 Jan 2018 00:19:27 +0000 (00:19 +0000)
author Chavi Weingarten <chaviw@google.com>
Tue, 30 Jan 2018 00:19:27 +0000 (00:19 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 30 Jan 2018 00:19:27 +0000 (00:19 +0000)
diff --cc services/core/java/com/android/server/wm/WindowContainer.java
Simple merge
author	Chavi Weingarten <chaviw@google.com>
	Tue, 30 Jan 2018 00:19:27 +0000 (00:19 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 30 Jan 2018 00:19:27 +0000 (00:19 +0000)