am 361f6c48: am af0a6184: (-s ours) am 8cc00243: Merge "Keep OverScroller.SplineOverScroller state consistent." into mnc-dev

* commit '361f6c48529557e57e3d1dc2aa64998ca581968a':