tree 473cd804ce753f075caabd477ca8d35b7c202038
parent 8f2e4b4225e1533d078c11e93b59b19461efeb98
parent f52ab456d2d463293074015a02e961cb76134d1d
author Winson Chung <winsonc@google.com> 1322091756 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1322091756 -0800

am f52ab456: am 65f9e9d4: Merge "Preventing springloaded mode from snapping back due to timeout. (Bug 5649189)" into ics-mr1

* commit 'f52ab456d2d463293074015a02e961cb76134d1d':
  Preventing springloaded mode from snapping back due to timeout. (Bug 5649189)