tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent 977b2f806546cc1baf649dcaae207ee0c6bad0bc
parent 25b57c4283f50ef7cf9d6e2aaade210528ca966f
author Winson Chung <winsonc@google.com> 1392410186 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410186 +0000

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 '25b57c4283f50ef7cf9d6e2aaade210528ca966f':