tree a1f1a0b7e49e8741373d147689facebdc27de518
parent 616af06ac5dc7df878086a4f66422e0c9ebbfe29
parent 04a231bbe44e9af184e76f124430a5bf7ae8ac8a
author Michael Jurka <mikejurka@google.com> 1385474375 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1385474375 -0800

am 04a231bb: Merge "Making workspace->overview transition smoother" into jb-ub-now-jolly-elf

* commit '04a231bbe44e9af184e76f124430a5bf7ae8ac8a':
  Making workspace->overview transition smoother