Merge "Revert back to lsq2 velocity strategy"

// this is the strategy that applications will actually use.  Be very careful

// when adjusting the default strategy because it can dramatically affect

// (often in a bad way) the user experience.

const char* VelocityTracker::DEFAULT_STRATEGY = "impulse";

const char* VelocityTracker::DEFAULT_STRATEGY = "lsq2";

VelocityTracker::VelocityTracker(const char* strategy) :

        mLastEventTime(0), mCurrentPointerIdBits(0), mActivePointerId(-1) {