tree 29847f7d8c06f0ff09b2fb975dd6773c033ee2f3
parent 566ec2a109a072c1430d357f26bbc35053cf33c6
parent 090c2ce88a6c7ccf6a0d6f52e3da9cf08aa4ccf8
author Casey Burkhardt <caseyburkhardt@google.com> 1381180914 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381180914 -0700

am 090c2ce8: am cffa7175: Merge "Disable clings when explore by touch is enabled. Bug: 11067870 Change-Id: If203f3a23de3bd3192ff748bbccc04d74b0a73fa" into jb-ub-now-indigo-rose

* commit '090c2ce88a6c7ccf6a0d6f52e3da9cf08aa4ccf8':
  Disable clings when explore by touch is enabled. Bug: 11067870 Change-Id: If203f3a23de3bd3192ff748bbccc04d74b0a73fa