Merge "Fixing regression in recents entrance animation when docking app" into nyc-dev

author Winson Chung <winsonc@google.com>

Tue, 29 Mar 2016 00:59:48 +0000 (00:59 +0000)

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

Tue, 29 Mar 2016 00:59:49 +0000 (00:59 +0000)
author Winson Chung <winsonc@google.com>
Tue, 29 Mar 2016 00:59:48 +0000 (00:59 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 29 Mar 2016 00:59:49 +0000 (00:59 +0000)
diff --cc packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java
Simple merge
author	Winson Chung <winsonc@google.com>
	Tue, 29 Mar 2016 00:59:48 +0000 (00:59 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 29 Mar 2016 00:59:49 +0000 (00:59 +0000)