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

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