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

Merge commit '73ccafb5b843cdcf9c8f761fc72a69b4b7942aaf' into gingerbread-plus-aosp

* commit '73ccafb5b843cdcf9c8f761fc72a69b4b7942aaf':
  Fix a bug where requestDisallowInterceptTouchEvent does not get called