tree cba62d0d64153aa2169651696bc238591341d679
parent 28260772ce843e5f0e5b31806232f470d68fb070
parent 8e15ab76d411cb6f20b8e37dd9130e4ab6d6d94c
author Michael Jurka <mikejurka@google.com> 1414085499 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085499 +0000

am 8e15ab76: am 4cb7d294: am e5db9b9d: am 04a231bb: Merge "Making workspace->overview transition smoother" into jb-ub-now-jolly-elf

* commit '8e15ab76d411cb6f20b8e37dd9130e4ab6d6d94c':