am bc337d2f: am 73ccafb5: Merge "Fix a bug where requestDisallowInterceptTouchEvent does not get called when scrolling is resumed after stopping a fling." into gingerbread
Merge commit 'bc337d2f'
* commit 'bc337d2f':
Fix a bug where requestDisallowInterceptTouchEvent does not get called