tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent a573321674d00403e5d19f41f13dd6e3f639da0a
parent 0d80b33097c0e495d36e0eb6f04a51d57ff48309
author Casey Burkhardt <caseyburkhardt@google.com> 1392411074 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411074 +0000

am 0d80b330: 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 '0d80b33097c0e495d36e0eb6f04a51d57ff48309':