commit | ad43cf4b28199f7038c40331dbaa20dbfa56bbf4 | [log] [tgz] |
---|---|---|
author | Vladislav Kaznacheev <kaznacheev@google.com> | Thu Aug 27 19:30:57 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 19:30:57 2015 +0000 |
tree | 536fdbb678025efa3d0a9086d5032cd8687dc1b1 | |
parent | 1cbb6daa17494e9c302d76751301c1a00a45c4cf [diff] | |
parent | 361f6c48529557e57e3d1dc2aa64998ca581968a [diff] |
am 361f6c48: am af0a6184: (-s ours) am 8cc00243: Merge "Keep OverScroller.SplineOverScroller state consistent." into mnc-dev * commit '361f6c48529557e57e3d1dc2aa64998ca581968a':