Merge "Remove custom scrollbar logic" into jb-dev

author John Reck <jreck@google.com>

Thu, 17 May 2012 00:35:08 +0000 (17:35 -0700)

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

Thu, 17 May 2012 00:35:08 +0000 (17:35 -0700)
author John Reck <jreck@google.com>
Thu, 17 May 2012 00:35:08 +0000 (17:35 -0700)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 17 May 2012 00:35:08 +0000 (17:35 -0700)
diff --cc core/java/android/webkit/WebViewClassic.java
Simple merge
author	John Reck <jreck@google.com>
	Thu, 17 May 2012 00:35:08 +0000 (17:35 -0700)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 17 May 2012 00:35:08 +0000 (17:35 -0700)