tree cd12fd7d38d858331a12db187c060e053615aa0f
parent af7a7c34e0752db2b8ec3dd7fa6e8d486ea010dc
parent e7c02ef40a10c599b13684a6f99a91eabd0f258f
author Adam Powell <adamp@google.com> 1283547641 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283547641 -0700

am e7c02ef4: Merge "Fix bug 2973252 - Make overscroll glow respect ifContentScrolls" into gingerbread

Merge commit 'e7c02ef40a10c599b13684a6f99a91eabd0f258f' into gingerbread-plus-aosp

* commit 'e7c02ef40a10c599b13684a6f99a91eabd0f258f':
  Fix bug 2973252 - Make overscroll glow respect ifContentScrolls