summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorAaron Whyte <awhyte@google.com>2017-02-16 03:41:21 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-02-16 03:41:25 +0000
commite0e21d9f19a68043a1d3dbff44b01fe339c3eecd (patch)
tree2259dc85a7ff0931c500d4badd939319bdec2852 /core/java/android
parent066eaa086adcf4874d22a14068b2e5fc175e3877 (diff)
parent22db07f3085ab0879bf9cff0e75a26044e1655e2 (diff)
Merge "Revert "Re-hide AXIS_SCROLL constant.""
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/view/MotionEvent.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/core/java/android/view/MotionEvent.java b/core/java/android/view/MotionEvent.java
index 2129039b1b8c..5f55bdc0e0d3 100644
--- a/core/java/android/view/MotionEvent.java
+++ b/core/java/android/view/MotionEvent.java
@@ -1008,7 +1008,6 @@ public final class MotionEvent extends InputEvent implements Parcelable {
* </p>
*
* @see #getAxisValue(int, int)
- * {@hide}
*/
public static final int AXIS_SCROLL = 26;