am 6888f559: Merge change If0c93a57 into eclair-mr2

Merge commit '6888f559ba215abd210df749c3ef63706d0bc56a' into eclair-mr2-plus-aosp

* commit '6888f559ba215abd210df749c3ef63706d0bc56a':
  add DragTracker class