Merge "Fix a flicker when window is removed during entering animation" into nyc-dev

author Chong Zhang <chz@google.com>

Fri, 13 May 2016 01:58:51 +0000 (01:58 +0000)

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

Fri, 13 May 2016 01:58:52 +0000 (01:58 +0000)
author Chong Zhang <chz@google.com>
Fri, 13 May 2016 01:58:51 +0000 (01:58 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 13 May 2016 01:58:52 +0000 (01:58 +0000)
diff --cc services/core/java/com/android/server/wm/WindowManagerService.java
Simple merge
author	Chong Zhang <chz@google.com>
	Fri, 13 May 2016 01:58:51 +0000 (01:58 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 13 May 2016 01:58:52 +0000 (01:58 +0000)