tree 0f0f3a3ce635dfcdb4cb81f5ff023e4f6e702263
parent 588d529e732b80d88fb998f17305a64eabde2ecb
parent 0c5363c8571eef11eeb21a575da941565c34191e
author Xavier Ducrohet <xav@android.com> 1274835043 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1274835043 -0700

am 0c5363c8: am 8e5605a7: Add QuickSearchBox to the SDK build.

Merge commit '0c5363c8571eef11eeb21a575da941565c34191e' into kraken

* commit '0c5363c8571eef11eeb21a575da941565c34191e':
  Add QuickSearchBox to the SDK build.