DO NOT MERGE -- Only use saved surface if started by launcher or moved to front

author Chong Zhang <chz@google.com>

Fri, 26 Aug 2016 23:28:17 +0000 (23:28 +0000)

committer android-build-merger <android-build-merger@google.com>

Fri, 26 Aug 2016 23:28:17 +0000 (23:28 +0000)
author Chong Zhang <chz@google.com>
Fri, 26 Aug 2016 23:28:17 +0000 (23:28 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 26 Aug 2016 23:28:17 +0000 (23:28 +0000)
diff --cc services/core/java/com/android/server/wm/WindowManagerService.java
Simple merge
author	Chong Zhang <chz@google.com>
	Fri, 26 Aug 2016 23:28:17 +0000 (23:28 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 26 Aug 2016 23:28:17 +0000 (23:28 +0000)