Merge "Set correct bounds when docked stack is removed" into nyc-dev

author Andrii Kulian <akulian@google.com>

Mon, 4 Apr 2016 21:13:48 +0000 (21:13 +0000)

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

Mon, 4 Apr 2016 21:13:49 +0000 (21:13 +0000)
author Andrii Kulian <akulian@google.com>
Mon, 4 Apr 2016 21:13:48 +0000 (21:13 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 4 Apr 2016 21:13:49 +0000 (21:13 +0000)
diff --cc services/core/java/com/android/server/am/ActivityStackSupervisor.java
Simple merge
author	Andrii Kulian <akulian@google.com>
	Mon, 4 Apr 2016 21:13:48 +0000 (21:13 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 4 Apr 2016 21:13:49 +0000 (21:13 +0000)