tree 10da860fcff71886af91d082e31f0e1917926848
parent 6cd4192b327e4a6b77a4b9da08746986f75f09fb
parent 339432f81019d698ba72ba129a6ffdc7b039bba7
author Adam Cohen <adamcohen@google.com> 1414566232 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566232 +0000

am 339432f8: 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 '339432f81019d698ba72ba129a6ffdc7b039bba7':