tree f1df97d13121648b7d18fe2a842d1a43c9fd1cd3
parent 5c8e3b5e496c6c1da12a03ee2eb5cbb3e5bd6a5a
parent 59a29f4a6ca7f6e177509f4c86a8ab968faf4f2c
author Adam Powell <adamp@google.com> 1284423904 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284423904 -0700

am 59a29f4a: (-s ours) am b07c0789: Merge "DO NOT MERGE Fix bug 2995887 - overscroll effect initialization issue" into gingerbread

Merge commit '59a29f4a6ca7f6e177509f4c86a8ab968faf4f2c'

* commit '59a29f4a6ca7f6e177509f4c86a8ab968faf4f2c':
  DO NOT MERGE Fix bug 2995887 - overscroll effect initialization issue