diff options
| author | Leon Scroggins III <scroggo@google.com> | 2010-09-17 14:31:45 -0400 |
|---|---|---|
| committer | Leon Scroggins III <scroggo@google.com> | 2010-09-17 14:31:45 -0400 |
| commit | 6a6d510c013a078aea890f91149022b3f57a0e51 (patch) | |
| tree | 8b2e6f8f994e1fe82d1ba843177d13fb5be6cd70 /res/xml | |
| parent | 18a1e1d1df382e1769609059a64a838544f7e8eb (diff) | |
| parent | fc2c6f1da5e614c7740be376817cebc8877db143 (diff) | |
| download | packages_apps_Browser-6a6d510c013a078aea890f91149022b3f57a0e51.zip packages_apps_Browser-6a6d510c013a078aea890f91149022b3f57a0e51.tar.gz packages_apps_Browser-6a6d510c013a078aea890f91149022b3f57a0e51.tar.bz2 | |
resolved conflicts for merge of fc2c6f1d to master
Change-Id: I708443617cf602a957a90a5770deab77c47c776f
Diffstat (limited to 'res/xml')
| -rw-r--r-- | res/xml/browser_preferences.xml | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/res/xml/browser_preferences.xml b/res/xml/browser_preferences.xml index 501d8c1..1da85ec 100644 --- a/res/xml/browser_preferences.xml +++ b/res/xml/browser_preferences.xml @@ -200,13 +200,6 @@ android:summary="@string/pref_content_search_engine_summary" android:dialogTitle="@string/pref_content_search_engine" /> - <CheckBoxPreference - android:key="show_search_suggestions" - android:defaultValue="true" - android:title="@string/pref_content_show_search_suggestions" - android:summaryOn="@string/pref_content_show_web_suggestions_summary_on" - android:summaryOff="@string/pref_content_show_web_suggestions_summary_off" /> - <PreferenceScreen android:key="website_settings" android:title="@string/pref_extras_website_settings" |