Merge "docs: remove incorrect (default) identifiers" into qt-dev am: 2c7d94c7ed am: b2a8b29d10
am: 311218304a
Change-Id: I9a27040720cbf66e070403c3ae70f3fe5ce0c001
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index eed8201..ce3f403 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -26391,7 +26391,7 @@
/**
* Returns the over-scroll mode for this view. The result will be
- * one of {@link #OVER_SCROLL_ALWAYS} (default), {@link #OVER_SCROLL_IF_CONTENT_SCROLLS}
+ * one of {@link #OVER_SCROLL_ALWAYS}, {@link #OVER_SCROLL_IF_CONTENT_SCROLLS}
* (allow over-scrolling only if the view content is larger than the container),
* or {@link #OVER_SCROLL_NEVER}.
*
@@ -26408,7 +26408,7 @@
/**
* Set the over-scroll mode for this view. Valid over-scroll modes are
- * {@link #OVER_SCROLL_ALWAYS} (default), {@link #OVER_SCROLL_IF_CONTENT_SCROLLS}
+ * {@link #OVER_SCROLL_ALWAYS}, {@link #OVER_SCROLL_IF_CONTENT_SCROLLS}
* (allow over-scrolling only if the view content is larger than the container),
* or {@link #OVER_SCROLL_NEVER}.
*