tree 7d17a634ea7174488a2386cef00c0e60d36da904
parent a69e9b9a1db92d3ac21285cfc52f315de2434033
parent bc8da2c7536c3a632f7d03aa27b77025e15d298a
author Adam Cohen <adamcohen@google.com> 1392410204 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410204 +0000

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

* commit 'bc8da2c7536c3a632f7d03aa27b77025e15d298a':