tree 12fe9866b7658f5180046c336eedf5449cc1e15c
parent 88f2f8fb43951c747e45080b010dd782216a65ba
parent 97db67ad178c7864ab1604bd81fba798faedc59c
author Winson Chung <winsonc@google.com> 1381278710 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381278710 -0700

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 '97db67ad178c7864ab1604bd81fba798faedc59c':
  Don't animate search bar when we are not animating the transition to workspace. (Bug 11105305)