tree fee471afac0438eb92902ba08cea7dcf722053e0
parent 2e288e70596b5e1c214bcd0f4216c2557b32f08e
parent 23caeac039d39788a7d152c34524698dac86222c
author Brian Attwell <brianattwell@google.com> 1412284013 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412284013 +0000

am 23caeac0: Merge "Work around scroller bugs" into lmp-dev

* commit '23caeac039d39788a7d152c34524698dac86222c':
  Work around scroller bugs