tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent d10bf225c6bcb69ccf2c2a08bfd24c4fdad96984
parent 60afed6ddc739dc4495f1772296e19d973a95ebb
author Adam Cohen <adamcohen@google.com> 1392411562 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411562 +0000

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

* commit '60afed6ddc739dc4495f1772296e19d973a95ebb':