tree 8b8421d7496561dd58223ca053f4f56fee9e140f
parent 34a4df429c2d9d689b8596d901ecb8fa125748e0
parent 6dd9ec512d8c239172385e632cdf47f6958fcb9d
author Adam Cohen <adamcohen@google.com> 1381280130 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381280130 -0700

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

* commit '6dd9ec512d8c239172385e632cdf47f6958fcb9d':
  Getting rid of additive blending for overscroll (issue 11072246)