tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent 418633fac5cc29a05f70133969320f9569c3a610
parent e89b990631bd44ee005a89f15ac95f6ad51074d1
author Winson Chung <winsonc@google.com> 1392410119 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410119 +0000

am e89b9906: am 0581fa98: am 54e65135: Ensuring that Launcher always has a search bar. (Bug 10965514)

* commit 'e89b990631bd44ee005a89f15ac95f6ad51074d1':