am d0725eef: (-s ours) Merge "Never drag scroll views with no children. (DO...
am d0725eef: (-s ours) Merge "Never drag scroll views with no children. (DO NOT MERGE)" into gingerbread
* commit 'd0725eef':
Never drag scroll views with no children. (DO NOT MERGE)