Merge into jb-mr1-dev

Change-Id: I4696f4336d79ca199f2358bfb3ed5fc7e6c51732

api/current.txt

@@ -27268,7 +27268,6 @@ package android.webkit {
     method public void setSupportZoom(boolean);
     method public deprecated synchronized void setTextSize(android.webkit.WebSettings.TextSize);
     method public synchronized void setTextZoom(int);
-    method public deprecated void setUseWebViewBackgroundForOverscrollBackground(boolean);
     method public synchronized void setUseWideViewPort(boolean);
     method public synchronized void setUserAgentString(java.lang.String);
     method public synchronized boolean supportMultipleWindows();

core/java/android/webkit/WebSettings.java

@@ -367,6 +367,7 @@ public abstract class WebSettings {
      * internal pattern. Default is true.
      *
      * @deprecated This method is now obsolete.
+     * @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1}
      */
     @Deprecated
     public void setUseWebViewBackgroundForOverscrollBackground(boolean view) {

docs/html/about/versions/android-2.3.jd

@@ -406,17 +406,6 @@ notification style.</li>
 </ul>
 </li>
 
-<li>WebView
-<ul>
-<li>New {@link
-android.webkit.WebSettings#setUseWebViewBackgroundForOverscrollBackground(
-boolean) setUseWebViewBackgroundForOverscrollBackground()} method lets a {@link
-android.webkit.WebView} specify whether to use its own background for the
-overscroll background. </li>
-</ul>
-</li>
-</ul>
-
 <h3 id="extralargescreens">Extra Large Screens</h3>
 
 <p>The platform now supports extra large screen sizes, such as those that might
@@ -707,4 +696,4 @@ declaring the attribute prevents the application from being installed on earlier
 versions of the platform.</p>
 
 <p>For more information, read <a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#ApiLevels">What is API
-Level?</a></p>
+Level?</a></p>