Merge "Update the Desktop UA to Chrome" into honeycomb-mr2

author John Reck <jreck@google.com>

Tue, 24 May 2011 18:03:11 +0000 (11:03 -0700)

committer Android (Google) Code Review <android-gerrit@google.com>

Tue, 24 May 2011 18:03:11 +0000 (11:03 -0700)
author John Reck <jreck@google.com>
Tue, 24 May 2011 18:03:11 +0000 (11:03 -0700)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 24 May 2011 18:03:11 +0000 (11:03 -0700)
diff --cc core/java/android/webkit/WebSettings.java
Simple merge
author	John Reck <jreck@google.com>
	Tue, 24 May 2011 18:03:11 +0000 (11:03 -0700)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 24 May 2011 18:03:11 +0000 (11:03 -0700)