tree f93a043baf198f2d24188ea7785b61c5cc4ffcb2
parent 4d9a30d8c284722a359ac1d52975ef008afdac00
parent dcd51f991e65b7f831c4ce3734f1e7e365585cfa
author Michael Jurka <mikejurka@google.com> 1297114987 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1297114987 -0800

am dcd51f99: am 4c1085f8: Fix spring-loaded mode

* commit 'dcd51f991e65b7f831c4ce3734f1e7e365585cfa':
  Fix spring-loaded mode