tree 10da860fcff71886af91d082e31f0e1917926848
parent 64e463b46540a384508a79c307444b67a7d1eb6c
parent ba7fe381ed2c348f6caed1f02b421889baf265a6
author Michael Jurka <mikejurka@google.com> 1414566373 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566373 +0000

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

* commit 'ba7fe381ed2c348f6caed1f02b421889baf265a6':