tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent 93ffb778305889bc465fd570a16b01483fbeb8b8
parent 19cd84351fdc87a76efa05300688a2db110543a8
author Adam Cohen <adamcohen@google.com> 1392410136 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410136 +0000

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

* commit '19cd84351fdc87a76efa05300688a2db110543a8':