am 17efcde1: Merge "DO NOT MERGE Fix bug 3124899 - timeout in CTS test ExpandableListViewBasicTest" into gingerbread

Merge commit '17efcde161cbcbc0d98bf809036c5e640497f001' into gingerbread-plus-aosp

* commit '17efcde161cbcbc0d98bf809036c5e640497f001':
  DO NOT MERGE Fix bug 3124899 - timeout in CTS test

core/java/android/widget/AbsListView.java

@@ -2890,7 +2890,9 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
                         overScrollBy(0, overshoot, 0, mScrollY, 0, 0,
                                 0, mOverflingDistance, false);
                     }
-                    edgeReached(delta);
+                    if (more) {
+                        edgeReached(delta);
+                    }
                     break;
                 }