tree 815b66ee07fca7d2770e3915db596a5401c261b2
parent 9fe2c4e2b89cbe4e22fdbcb3d5ecae1a853b133e
parent 110486f932510fb49bfeff978b0b0e0237ee0656
author Adam Powell <adamp@google.com> 1277314004 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1277314004 -0700

Merge "Fix a bug where requestDisallowInterceptTouchEvent does not get called when scrolling is resumed after stopping a fling." into gingerbread