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

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