tree edb16d0776a4ccccc5dab9963a63281e2a96b8d5
parent 33c3c2fa0ec1c71eeda24d2ca72dbcb2ff75eabc
parent 57dadda8442e3182081e7929bda940c098c147e5
author Adam Cohen <adamcohen@google.com> 1426743404 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426743404 +0000

am 57dadda8: Merge "Make sure we set the QSB bar on the SearchDropTargetBar" into ub-launcher3-burnaby

* commit '57dadda8442e3182081e7929bda940c098c147e5':
  Make sure we set the QSB bar on the SearchDropTargetBar