tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent 1aca0a2f90060574ed1716b23693ea6a2baf8928
parent d175f7bba2563f78c779e2db389ce009ce892fc9
author Casey Burkhardt <caseyburkhardt@google.com> 1392410174 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410174 +0000

am d175f7bb: 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 'd175f7bba2563f78c779e2db389ce009ce892fc9':