tree e35ecf0ff78f3205471b07252e2b6f85aea099ef
parent c8d3b499ed7c899bb534c326e25b58ffa79714d6
parent 65f9e9d45b8ba9aa819be2c4fca1722db7784868
author Winson Chung <winsonc@google.com> 1322091616 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1322091616 -0800

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

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