am b4529b0a: Merge "HorizontalScrollView should delay child presses" into ics-mr1

* commit 'b4529b0adca243644f601c9fe5d419c283bf57c1':
  HorizontalScrollView should delay child presses