Merge "Remove temporary work-around for auto login." into honeycomb

author Patrick Scott <phanna@android.com>

Thu, 13 Jan 2011 18:29:00 +0000 (10:29 -0800)

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

Thu, 13 Jan 2011 18:29:00 +0000 (10:29 -0800)
author Patrick Scott <phanna@android.com>
Thu, 13 Jan 2011 18:29:00 +0000 (10:29 -0800)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 13 Jan 2011 18:29:00 +0000 (10:29 -0800)
diff --cc WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp
Simple merge
author	Patrick Scott <phanna@android.com>
	Thu, 13 Jan 2011 18:29:00 +0000 (10:29 -0800)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 13 Jan 2011 18:29:00 +0000 (10:29 -0800)