tree 10da860fcff71886af91d082e31f0e1917926848
parent bf730156e9df710c3b4f65df305f479e5cb0d3d8
parent 786e37cf5e95dddbf4efe997b5c81abcbb9e8919
author Casey Burkhardt <caseyburkhardt@google.com> 1414566206 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566206 +0000

am 786e37cf: am 8abf917e: 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 '786e37cf5e95dddbf4efe997b5c81abcbb9e8919':