am f4ccbc5d: (-s ours) am 3c54806d: reconcile froyo-release into gingerbread
Merge commit 'f4ccbc5d46f43dc18e3b87cb3348a634e003630f'
* commit 'f4ccbc5d46f43dc18e3b87cb3348a634e003630f':
Import translations for search engine setting. DO NOT MERGE
Use translation from donut for "Set search engine." DO NOT MERGE
Default to Google if global search provider not present.
Remove "Show web suggestions" from browser settings
Send WEB_SEARCH intent straight to default search provider if selected
Fix Google suggest and search URLs when Google Search is not installed
Clear voice search mode when changing search engines.
Fixes for changing the search engine.
Add user-selected search providers to browser