tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent 511ced177b95a1f301af6ff24d4868af6772d831
parent 3c98d683c7ac21c95ae84b0a3e5da3cf10510694
author Winson Chung <winsonc@google.com> 1392411092 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411092 +0000

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 '3c98d683c7ac21c95ae84b0a3e5da3cf10510694':