am 9a589980: Merge "Remove Broken TouchDelegateTest#testOn" into gingerbread

* commit '9a589980b74f2976e72c273969b027a0fa694492':
  Remove Broken TouchDelegateTest#testOn