tree 4f3960d2e2d5331bbc1f5b45d87417f530d0feae
parent e9246f77fd63ca1040af04242629d6faba2c2b69
parent 73e087d19ef42e7e1b8af1cdcf5c272b8a1d8df5
author Michael Jurka <mikejurka@google.com> 1296071058 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296071058 -0800

am 73e087d1: Merge "Fix issue with spring loaded mode" into honeycomb

* commit '73e087d19ef42e7e1b8af1cdcf5c272b8a1d8df5':
  Fix issue with spring loaded mode