tree 585f6577fa896b5582bbdc637a02c3e16b0fcbfc
parent c427e27269e52759faec858ab221358ba0c40b02
parent 2b8dcdeda484c3ed92969420a19ba48c2f877c81
author Winson <winsonc@google.com> 1463096010 +0000
committer android-build-merger <android-build-merger@google.com> 1463096010 +0000

Merge "Workaround for empty recents, defer the enter animation." into nyc-dev
am: 2b8dcdeda4

* commit '2b8dcdeda484c3ed92969420a19ba48c2f877c81':
  Workaround for empty recents, defer the enter animation.

Change-Id: Ie4b9c468c4b42a42cbbf0eb9892f074f771c6ea0