Merge "Fix wallpaper cropped too soon when unminimizing dock" into nyc-dev

author Chong Zhang <chz@google.com>

Tue, 17 May 2016 23:35:26 +0000 (23:35 +0000)

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

Tue, 17 May 2016 23:35:27 +0000 (23:35 +0000)
author Chong Zhang <chz@google.com>
Tue, 17 May 2016 23:35:26 +0000 (23:35 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 17 May 2016 23:35:27 +0000 (23:35 +0000)
diff --cc services/core/java/com/android/server/wm/TaskStack.java
Simple merge
author	Chong Zhang <chz@google.com>
	Tue, 17 May 2016 23:35:26 +0000 (23:35 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 17 May 2016 23:35:27 +0000 (23:35 +0000)