Merge "Defer resizing invisible stacks while drag resizing" into pi-dev

author TreeHugger Robot <treehugger-gerrit@google.com>

Fri, 20 Apr 2018 14:43:38 +0000 (14:43 +0000)

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

Fri, 20 Apr 2018 14:43:38 +0000 (14:43 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Fri, 20 Apr 2018 14:43:38 +0000 (14:43 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 20 Apr 2018 14:43:38 +0000 (14:43 +0000)
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
diff --cc services/core/java/com/android/server/wm/WindowState.java
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Fri, 20 Apr 2018 14:43:38 +0000 (14:43 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 20 Apr 2018 14:43:38 +0000 (14:43 +0000)
		1	2
services/core/java/com/android/server/am/ActivityManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/wm/WindowState.java	patch \|	diff1 \|	diff2 \|	blob \| history