OSDN Git Service

am af0a6184: (-s ours) am 8cc00243: Merge "Keep OverScroller.SplineOverScroller state...
authorVladislav Kaznacheev <kaznacheev@google.com>
Thu, 27 Aug 2015 10:02:24 +0000 (10:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:02:24 +0000 (10:02 +0000)
* commit 'af0a61845615c47800e2de0f26c848fe6f3a136c':


Trivial merge