tree fee471afac0438eb92902ba08cea7dcf722053e0
parent 93ca20373925dcd02caef73ae7bb1e67d2d63387
parent d7dd7ddfdc3f54985f5950a76b812ea17edecc96
author Brian Attwell <brianattwell@google.com> 1412285576 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412285576 +0000

am d7dd7ddf: am 2959f89a: am 91271ea8: am 23caeac0: Merge "Work around scroller bugs" into lmp-dev

* commit 'd7dd7ddfdc3f54985f5950a76b812ea17edecc96':
  Work around scroller bugs