tree cba62d0d64153aa2169651696bc238591341d679
parent 0041ad07b47603c95d13eefcdf854a749b57fde2
parent 0750a548dba7c8de21322f31c4147481121e29e4
author Adam Cohen <adamcohen@google.com> 1414085227 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085227 +0000

am 0750a548: am 01f8bbd7: am 19cd8435: am 625863ef: am 9cfd5863: Merge "Toning down overscroll overlay (issue 11023942)" into jb-ub-now-indigo-rose

* commit '0750a548dba7c8de21322f31c4147481121e29e4':