tree 473cd804ce753f075caabd477ca8d35b7c202038
parent aafa04987dd318e104fd29dbda8ee535a7e9dae6
parent bb1e76bee9fa793f25f624e90ef9854146211f86
author Winson Chung <winsonc@google.com> 1322091866 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1322091866 -0800

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

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