diff options
| author | Grace Kloba <klobag@google.com> | 2009-07-01 14:08:43 -0700 |
|---|---|---|
| committer | Grace Kloba <klobag@google.com> | 2009-07-01 14:08:43 -0700 |
| commit | 2a6725815dd0a147b90c7d60298cc4abecb0d1ff (patch) | |
| tree | b57fde31c04651ff781c6ccf13bf4bdd65d61ccc /res/xml/debug_preferences.xml | |
| parent | d3ba2098fc6d4ca6d87c5dfc6c39782c596bcf46 (diff) | |
| parent | 47fdfdb989ffb79590a39c40792be995de32e521 (diff) | |
| download | packages_apps_Browser-2a6725815dd0a147b90c7d60298cc4abecb0d1ff.tar.gz packages_apps_Browser-2a6725815dd0a147b90c7d60298cc4abecb0d1ff.tar.bz2 packages_apps_Browser-2a6725815dd0a147b90c7d60298cc4abecb0d1ff.zip | |
resolved conflicts for merge of 47fdfdb9 to master
Diffstat (limited to 'res/xml/debug_preferences.xml')
| -rw-r--r-- | res/xml/debug_preferences.xml | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/res/xml/debug_preferences.xml b/res/xml/debug_preferences.xml index c39ae5b07..00982fcff 100644 --- a/res/xml/debug_preferences.xml +++ b/res/xml/debug_preferences.xml @@ -50,11 +50,6 @@ android:defaultValue="false" android:title="@string/pref_development_nav_dump" /> - <com.android.browser.BrowserSearchpagePreference - android:key="search_url" - android:title="@string/pref_development_search_url" - android:singleLine="true" /> - <EditTextPreference android:key="js_engine_flags" android:title="@string/js_engine_flags" |