OSDN Git Service

am 8774c667: Remove "Show web suggestions" from browser settings
authorLeon Scroggins III <scroggo@google.com>
Fri, 17 Sep 2010 18:07:39 +0000 (11:07 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 17 Sep 2010 18:07:39 +0000 (11:07 -0700)
Merge commit '8774c667dd446346dca5f5d3c89092fbc86448d0' into gingerbread

* commit '8774c667dd446346dca5f5d3c89092fbc86448d0':
  Remove "Show web suggestions" from browser settings

1  2 
res/values/strings.xml
src/com/android/browser/BrowserProvider.java
src/com/android/browser/BrowserSettings.java

Simple merge