Merge "Fixing crash in recents window transition. (Bug 18246975, 18159006)" into...

author Winson Chung <winsonc@google.com>

Wed, 5 Nov 2014 21:39:15 +0000 (21:39 +0000)

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

Wed, 5 Nov 2014 21:39:16 +0000 (21:39 +0000)
author Winson Chung <winsonc@google.com>
Wed, 5 Nov 2014 21:39:15 +0000 (21:39 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 5 Nov 2014 21:39:16 +0000 (21:39 +0000)
diff --cc services/core/java/com/android/server/wm/WindowManagerService.java
Simple merge
diff --cc services/core/java/com/android/server/wm/WindowStateAnimator.java
Simple merge
author	Winson Chung <winsonc@google.com>
	Wed, 5 Nov 2014 21:39:15 +0000 (21:39 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 5 Nov 2014 21:39:16 +0000 (21:39 +0000)
		1	2
services/core/java/com/android/server/wm/WindowManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/wm/WindowStateAnimator.java	patch \|	diff1 \|	diff2 \|	blob \| history