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

* commit 'af0a61845615c47800e2de0f26c848fe6f3a136c':