Merge "Ensure that a PIP activity gets stopped before MW/PIP mode changes." into...

author Winson Chung <winsonc@google.com>

Sat, 8 Apr 2017 00:30:30 +0000 (00:30 +0000)

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

Sat, 8 Apr 2017 00:30:34 +0000 (00:30 +0000)
author Winson Chung <winsonc@google.com>
Sat, 8 Apr 2017 00:30:30 +0000 (00:30 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Sat, 8 Apr 2017 00:30:34 +0000 (00:30 +0000)
diff --cc services/core/java/com/android/server/am/ActivityStack.java
Simple merge
diff --cc services/core/java/com/android/server/am/ActivityStackSupervisor.java
Simple merge
author	Winson Chung <winsonc@google.com>
	Sat, 8 Apr 2017 00:30:30 +0000 (00:30 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Sat, 8 Apr 2017 00:30:34 +0000 (00:30 +0000)
		1	2
services/core/java/com/android/server/am/ActivityStack.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/am/ActivityStackSupervisor.java	patch \|	diff1 \|	diff2 \|	blob \| history