tree 6e74253f88e34a79f1aa3da5aeb5ae618aeb4c5a
parent 8355dc054c1c9f5c1b3d302f68455447ab2fdb4a
parent 1adb4cbda3ea76c0461ec9700b93a98a7dd4ee36
author TreeHugger Robot <treehugger-gerrit@google.com> 1501863059 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1501863059 +0000

Merge changes from topic 'am-4864e8c3-e581-4e7f-bc1f-7276c1bf7352' into ub-launcher3-master

* changes:
  [automerger] Fix bug where user gets stuck in overscroll. am: 27ad267a81 am: 572da280d3
  [automerger] Fix bug where user gets stuck in overscroll. am: 27ad267a81
  Fix bug where user gets stuck in overscroll.