tree 29847f7d8c06f0ff09b2fb975dd6773c033ee2f3
parent 70e4cf1c610765ba559255d07e0a9420ddb86c68
parent cffa7175f8328cfbf6bc9ed1507f1900fe4bc85c
author Casey Burkhardt <caseyburkhardt@google.com> 1381180791 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381180791 -0700

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

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