tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent 610309e532bbf7f77dd184d7b8706e347edb7468
parent fe95d2dcf4e05a05d4206ff408296479c62d6576
author Adam Cohen <adamcohen@google.com> 1392411093 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411093 +0000

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 'fe95d2dcf4e05a05d4206ff408296479c62d6576':