tree 4298c0356ff00b533189bd1608ae9d9ca98cb238
parent 8c9802ef3bf679a5094a905da91e053110c4dbeb
parent 1226be4398d848fe59ddf9718d9a2939ae5b8e43
author Adam Cohen <adamcohen@google.com> 1381533870 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381533870 -0700

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

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