tree fbbf1af8b3273ee69e60750c87c447c0c013dd1e
parent 0329c06a8ce3a655fe903f44f4b61505bb87a563
parent 2aef617f4afac074288818f6a63238fb836df361
author Brian Attwell <brianattwell@google.com> 1414435825 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414435825 +0000

am 2aef617f: am bb8cc37e: Merge "Don\'t forget header momentum upon scroll events" into lmp-dev

* commit '2aef617f4afac074288818f6a63238fb836df361':