tree 86915529e790eecb35ee2312512153b850fe8774
parent 7078af908063f60d7a1034b41d179b41ec0e8693
parent 8c4ca9277dcb92cb965a1e58eef59ad9868ae44e
author Adam Cohen <adamcohen@google.com> 1414473103 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414473103 +0000

am 8c4ca927: Fix edge case where LauncherOverlay scroll woudln\'t be reset

* commit '8c4ca9277dcb92cb965a1e58eef59ad9868ae44e':
  Fix edge case where LauncherOverlay scroll woudln't be reset