Merge "Fixed bugs with starting windows when displayng forcedResized activity" into...

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

Tue, 17 May 2016 00:51:40 +0000 (00:51 +0000)

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

Tue, 17 May 2016 00:51:41 +0000 (00:51 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Tue, 17 May 2016 00:51:40 +0000 (00:51 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 17 May 2016 00:51:41 +0000 (00:51 +0000)
diff --cc services/core/java/com/android/server/am/ActivityStack.java
Simple merge
diff --cc services/core/java/com/android/server/am/ActivityStarter.java
Simple merge
diff --cc services/core/java/com/android/server/wm/WindowManagerService.java
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Tue, 17 May 2016 00:51:40 +0000 (00:51 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 17 May 2016 00:51:41 +0000 (00:51 +0000)
		1	2
services/core/java/com/android/server/am/ActivityStack.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/am/ActivityStarter.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/wm/WindowManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history