summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-09-25 09:46:15 -0700
committerJean-Baptiste Queru <jbq@google.com>2012-09-25 09:46:23 -0700
commit5ef9cb68c3bb639990abc0eadcaaaa61164ad628 (patch)
tree5f6d1ea8c7ddc6013ef4c18aae2fa5c26325f764 /core/java/android
parentb8d4c9ff22f114983a088281f0859bc94c1ea7db (diff)
parentd0b90d30d86679fe52cb1af383900a70fc44cb2a (diff)
Merge into jb-mr1-dev
Change-Id: I4696f4336d79ca199f2358bfb3ed5fc7e6c51732
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/webkit/WebSettings.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java
index be2d8634121d..aa689044e510 100644
--- a/core/java/android/webkit/WebSettings.java
+++ b/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) {