am 8496ddc5: Merge "b/3307761 Tuning two fingers pan." into honeycomb-mr1

* commit '8496ddc536eb917c813b7928f174c828d2275ada':
  b/3307761 Tuning two fingers pan.