Merge "Workaround to ensure we cancel the recents animation prior to starting home...

author Winson Chung <winsonc@google.com>

Fri, 20 Apr 2018 02:07:23 +0000 (19:07 -0700)

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

Fri, 20 Apr 2018 02:07:23 +0000 (19:07 -0700)
author Winson Chung <winsonc@google.com>
Fri, 20 Apr 2018 02:07:23 +0000 (19:07 -0700)
committer android-build-merger <android-build-merger@google.com>
Fri, 20 Apr 2018 02:07:23 +0000 (19:07 -0700)
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
author	Winson Chung <winsonc@google.com>
	Fri, 20 Apr 2018 02:07:23 +0000 (19:07 -0700)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 20 Apr 2018 02:07:23 +0000 (19:07 -0700)