tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent 0cf3f608d7d001be39bd28d7c01d442857aaf1b4
parent a8e04b72ed6667dda05537765ccab6d54eec370c
author Winson Chung <winsonc@google.com> 1392411561 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411561 +0000

am a8e04b72: am 3c98d683: am 25b57c42: am 97db67ad: am 0553f88a: Merge "Don\'t animate search bar when we are not animating the transition to workspace. (Bug 11105305)" into jb-ub-now-indigo-rose

* commit 'a8e04b72ed6667dda05537765ccab6d54eec370c':