tree 15ed5557e6c69b0bdc35e02f6859493cdbf63a53
parent 524e2f9c763adac6a6e02ccf85f77bc4b7a4fbca
parent c32132853f9eaf62ec59fa375a288b957c50e53a
author Vladislav Kaznacheev <kaznacheev@google.com> 1438804650 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438804650 +0000

am c3213285: am 072097bd: am 8cc00243: Merge "Keep OverScroller.SplineOverScroller state consistent." into mnc-dev

* commit 'c32132853f9eaf62ec59fa375a288b957c50e53a':
  Keep OverScroller.SplineOverScroller state consistent.