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

Merge commit '7f737ca14895f4263c4ff4390a0e7ad0149a7a62'

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