Merge "Do not reveal selection unless the focus controller is active." into honeycomb

author Leon Scroggins <scroggo@google.com>

Thu, 20 Jan 2011 13:56:12 +0000 (05:56 -0800)

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

Thu, 20 Jan 2011 13:56:12 +0000 (05:56 -0800)
author Leon Scroggins <scroggo@google.com>
Thu, 20 Jan 2011 13:56:12 +0000 (05:56 -0800)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 20 Jan 2011 13:56:12 +0000 (05:56 -0800)
diff --cc WebKit/android/jni/WebViewCore.cpp
Simple merge
author	Leon Scroggins <scroggo@google.com>
	Thu, 20 Jan 2011 13:56:12 +0000 (05:56 -0800)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 20 Jan 2011 13:56:12 +0000 (05:56 -0800)