tree 4298c0356ff00b533189bd1608ae9d9ca98cb238
parent a78bfcc9d02da4d47598461c1549742378d27b85
parent 30b63be16023b1967e6f70bcb37b09c137db834b
author Adam Cohen <adamcohen@google.com> 1381534009 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381534009 -0700

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

* commit '30b63be16023b1967e6f70bcb37b09c137db834b':
  Fix custom content scroll effects bug (recent regression) (issue 11188769)