tree ed70a93eb15cc3bac3a6c764d7a54c80d2e6e83b
parent d69f51ddd5b6c28c9d16725e65facaf830d650e1
parent 7f737ca14895f4263c4ff4390a0e7ad0149a7a62
author Jean-Baptiste Queru <jbq@google.com> 1284559579 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284559579 -0700

am 7f737ca1: (-s ours) resolve merge of 8bf09b62 to gingerbread-plus-aosp

Merge commit '7f737ca14895f4263c4ff4390a0e7ad0149a7a62'

* commit '7f737ca14895f4263c4ff4390a0e7ad0149a7a62':
  Add user-selected search providers to browser