From: Ben Murdoch <benm@google.com>
Date: Mon, 21 Sep 2009 15:10:14 +0000 (-0700)
Subject: am 9f009767: Merge change 26147 into eclair
X-Git-Tag: android-x86-2.2~137^2~89
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=372a3b3a418477547f4871ce89188adb40a0d510;p=android-x86%2Fpackages-apps-Browser.git

am 9f009767: Merge change 26147 into eclair

Merge commit '9f009767d91d8fd43607d90b832c7cbe56847a08' into eclair-plus-aosp

* commit '9f009767d91d8fd43607d90b832c7cbe56847a08':
  Make the Combined Bookmark and History Activity use the BrowserActivity as it's search provider so that we can start typing on the bookmarks page and perform a search/URL load.
---

372a3b3a418477547f4871ce89188adb40a0d510