summaryrefslogtreecommitdiffstats
path: root/v4/java/android
diff options
context:
space:
mode:
authorChris Banes <chrisbanes@google.com>2015-11-05 10:34:43 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-11-05 10:34:43 +0000
commit203499a0c7decbd101a8ba4b566c681b9c725c80 (patch)
treeef1998fa226675ddc3c3e3cd389dbfaa748a7bd7 /v4/java/android
parentc9d7594ade1d727f6e1c4bd797aaaeb553826db9 (diff)
parentcb3b6124a87f9116ce92fcf17f59287445c41442 (diff)
downloadandroid_frameworks_support-203499a0c7decbd101a8ba4b566c681b9c725c80.tar.gz
android_frameworks_support-203499a0c7decbd101a8ba4b566c681b9c725c80.tar.bz2
android_frameworks_support-203499a0c7decbd101a8ba4b566c681b9c725c80.zip
Merge "NestedScrollView onStopNestedScroll fix" into mnc-ub-dev
Diffstat (limited to 'v4/java/android')
-rw-r--r--v4/java/android/support/v4/widget/NestedScrollView.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/v4/java/android/support/v4/widget/NestedScrollView.java b/v4/java/android/support/v4/widget/NestedScrollView.java
index 40fd2578cd..27e43076d9 100644
--- a/v4/java/android/support/v4/widget/NestedScrollView.java
+++ b/v4/java/android/support/v4/widget/NestedScrollView.java
@@ -270,6 +270,7 @@ public class NestedScrollView extends FrameLayout implements NestedScrollingPare
@Override
public void onStopNestedScroll(View target) {
+ mParentHelper.onStopNestedScroll(target);
stopNestedScroll();
}