tree aabc915b2771aa14c6c9a40f5ed6c5faa70a9cd9
parent 7f7a38f30a830676c302d38bb3e80488683396db
parent 5c05b4dcc123052023f077e6e5be85d24643ff42
author Maryam Garrett <mkamvar@google.com> 1260541641 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260541641 -0800

am 946bfa49: Merge change Ida4d6ab0 into eclair-mr2

Merge commit '946bfa490a4df62bfb48e8017c329b052e3e905e' into eclair-mr2-plus-aosp

* commit '946bfa490a4df62bfb48e8017c329b052e3e905e':
  Allows users to scroll while in select mode.