tree 10da860fcff71886af91d082e31f0e1917926848
parent 4729cab7d8de3681631ce39394d0a38cb195e0c1
parent 3d31a67ede29a9ecd99a15a095399c25336af32c
author Adam Cohen <adamcohen@google.com> 1414566113 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566113 +0000

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

* commit '3d31a67ede29a9ecd99a15a095399c25336af32c':