tree 8b8421d7496561dd58223ca053f4f56fee9e140f
parent 93fb660b84f41d9256ec7e7e562ed8f5ca798e9e
parent d706e0a8133a3a570013b7512c593845850a0f1f
author Adam Cohen <adamcohen@google.com> 1381279962 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381279962 -0700

am d706e0a8: Merge "Getting rid of additive blending for overscroll (issue 11072246)" into jb-ub-now-indigo-rose

* commit 'd706e0a8133a3a570013b7512c593845850a0f1f':
  Getting rid of additive blending for overscroll (issue 11072246)