tree 098492f947523863487be44a20fc766a548613ae
parent a31b4b8c2509343c4f387a0175116425a06ae9f3
parent 9d0e7203baf33239a649a49505944946c3586b9a
author Sunny Goyal <sunnygoyal@google.com> 1527027654 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1527027654 +0000

Merge changes from topic "am-74dc7dc8-e2ec-493b-90ca-01725fc50357" into ub-launcher3-master

* changes:
  [automerger] Reset the vertical progress when the discovery bounce is closed am: 0bd0244a73
  Reset the vertical progress when the discovery bounce is closed