tree 5b1153bf9a3fe3660d5695a3f3dda5faa75e781a
parent eb09aaa5acd4bfaa4e71c60f23a934294b8130cd
parent e8f676c0e580f5ffffbc23befd4b4ffac0d0a332
author Alan Viverette <alanv@google.com> 1414050944 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414050944 +0000

am e8f676c0: Merge "Use correct smooth scroll default duration" into lmp-mr1-dev

* commit 'e8f676c0e580f5ffffbc23befd4b4ffac0d0a332':
  Use correct smooth scroll default duration