Merge "Clear starting window request if remove is requested before it is added" into...

author Wale Ogunwale <ogunwale@google.com>

Fri, 26 Feb 2016 21:22:10 +0000 (21:22 +0000)

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

Fri, 26 Feb 2016 21:22:11 +0000 (21:22 +0000)
author Wale Ogunwale <ogunwale@google.com>
Fri, 26 Feb 2016 21:22:10 +0000 (21:22 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 26 Feb 2016 21:22:11 +0000 (21:22 +0000)
diff --cc services/core/java/com/android/server/am/ActivityRecord.java
Simple merge
diff --cc services/core/java/com/android/server/wm/WindowManagerService.java
Simple merge
author	Wale Ogunwale <ogunwale@google.com>
	Fri, 26 Feb 2016 21:22:10 +0000 (21:22 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 26 Feb 2016 21:22:11 +0000 (21:22 +0000)
		1	2
services/core/java/com/android/server/am/ActivityRecord.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/wm/WindowManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history