tree b0f4c27064b443699cc734227fcff0504f9393dc
parent dc734ef2c0a7152b0ada9425fd54c556128f3be4
parent a45de07ece42b8dac4d5a99326ebf2d4b72ef267
author Adam Cohen <adamcohen@google.com> 1381533731 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1381533731 +0000

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