tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent f90355b91edbfdaf0f80dcfa87af5268ed598ea1
parent e58c7bc134cb7271d37cef506f9af96285059401
author Adam Cohen <adamcohen@google.com> 1392410188 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410188 +0000

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

* commit 'e58c7bc134cb7271d37cef506f9af96285059401':