tree cba62d0d64153aa2169651696bc238591341d679
parent 64e3a6d8371f13653b7cbd444e4238e564c55675
parent a8e04b72ed6667dda05537765ccab6d54eec370c
author Winson Chung <winsonc@google.com> 1414085304 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085304 +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':