tree c300f8645dda259c79e7ac221584af9401a210ad
parent 1d51c21a2ea6e9bd5f318e8140b00e3f8a17a5a4
parent 625863ef3a3adf111456cc1e657a7a70a091f85a
author Adam Cohen <adamcohen@google.com> 1380722297 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380722297 -0700

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

* commit '625863ef3a3adf111456cc1e657a7a70a091f85a':
  Toning down overscroll overlay (issue 11023942)