tree 380bbbb1666ddbc975f210f8d47912363440eed0
parent 483a9ddaf7ffb0be05bd407212a6988cb2661b17
parent 692e121b546594a15f737659e4f0c3b844e08e75
author Adam Powell <adamp@google.com> 1283274602 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283274602 -0700

am a9c43aaa: (-s ours) am 0a77ce27: New edge effects for scrolling widgets (overscroll)

Merge commit 'a9c43aaa4482819ca14bb5f036b328dd4e5f2211'

* commit 'a9c43aaa4482819ca14bb5f036b328dd4e5f2211':
  New edge effects for scrolling widgets (overscroll)