tree bfd832d5976d60b1674a0c90c26ec67c69c7d391
parent 918569e864c3c38e96d68e65969042852a9135f7
parent 4f2443a5a31cbe09fe8f5e89fa1d08d185d9ae50
author Adam Cohen <adamcohen@google.com> 1392411115 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411115 +0000

am 4f2443a5: am bc8da2c7: am 30b63be1: am 1226be43: Merge "Fix custom content scroll effects bug (recent regression) (issue 11188769)" into jb-ub-now-indigo-rose

* commit '4f2443a5a31cbe09fe8f5e89fa1d08d185d9ae50':