tree 21b99a2663beab15fb3801b6dd169f44febeb293
parent a512415e13def82532e89fa763f3c8b5ce8bcc7c
parent 8cc00243423e22a36c518cd5ece97b45271ae5e8
author Vladislav Kaznacheev <kaznacheev@google.com> 1438803637 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438803637 +0000

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

* commit '8cc00243423e22a36c518cd5ece97b45271ae5e8':
  Keep OverScroller.SplineOverScroller state consistent.