tree 10da860fcff71886af91d082e31f0e1917926848
parent f3b0895c6505792e26a68a266f20c418f3cc6761
parent 865cb535d27b886b39295e7a8b9cb3929b28dac3
author Winson Chung <winsonc@google.com> 1414566230 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566230 +0000

am 865cb535: 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 '865cb535d27b886b39295e7a8b9cb3929b28dac3':