tree cba62d0d64153aa2169651696bc238591341d679
parent 6cf4bf2e4756e39b24350d8989db2f47d04f7680
parent 3a52075096600cae1da7a36c20069bd7028c17fa
author Winson Chung <winsonc@google.com> 1414085187 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085187 +0000

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

* commit '3a52075096600cae1da7a36c20069bd7028c17fa':