tree 3965c2d732365afbf613443798f762aee9efea13
parent 24906b4f3be61fce49f644614db48d5e0c1004c0
parent 0b2d171f141dc9f4d89400d842a140c0be1fff6b
author android-build-team Robot <android-build-team-robot@google.com> 1525208879 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1525208879 +0000

Merge changes from topic "am-85c4a06c-b495-4e8b-9fa0-1fa07db12132" into ub-launcher3-master

* changes:
  [automerger] Bound overscroll shift amount to avoid content from drawing on top (Y-val) of the QSB. am: 5916709219
  Bound overscroll shift amount to avoid content from drawing on top (Y-val) of the QSB.