Merge "Prepare to replace windows across recreate()." into nyc-dev

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

Thu, 5 May 2016 19:38:15 +0000 (19:38 +0000)

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

Thu, 5 May 2016 19:38:17 +0000 (19:38 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Thu, 5 May 2016 19:38:15 +0000 (19:38 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 5 May 2016 19:38:17 +0000 (19:38 +0000)
diff --cc core/java/android/app/ActivityThread.java
Simple merge
diff --cc services/core/java/com/android/server/wm/WindowManagerService.java
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Thu, 5 May 2016 19:38:15 +0000 (19:38 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 5 May 2016 19:38:17 +0000 (19:38 +0000)
		1	2
core/java/android/app/ActivityThread.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/wm/WindowManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history