tree cba62d0d64153aa2169651696bc238591341d679
parent 355b193e9561f607ca60d8537ad7510f88fb18bd
parent 60afed6ddc739dc4495f1772296e19d973a95ebb
author Adam Cohen <adamcohen@google.com> 1414085306 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085306 +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':