am b3536145: am ed48fa89: Merge "Touch pad improvements. Bug: 4124987" into honeycomb-mr2

* commit 'b3536145725250401d25ffa00cda85d222dfc21e':
  Touch pad improvements. Bug: 4124987