Merge "Ensure transparent assistant works with PiP" into oc-dr1-dev

author Winson Chung <winsonc@google.com>

Wed, 12 Jul 2017 00:01:48 +0000 (00:01 +0000)

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

Wed, 12 Jul 2017 00:01:48 +0000 (00:01 +0000)
author Winson Chung <winsonc@google.com>
Wed, 12 Jul 2017 00:01:48 +0000 (00:01 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 12 Jul 2017 00:01:48 +0000 (00:01 +0000)
diff --cc services/core/java/com/android/server/am/ActivityStack.java
Simple merge
author	Winson Chung <winsonc@google.com>
	Wed, 12 Jul 2017 00:01:48 +0000 (00:01 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 12 Jul 2017 00:01:48 +0000 (00:01 +0000)