tree 28f50566b64fb36626aa6e8d343c1c856548d953
parent f49efc81592d1759435ea24b54401d1e1befbc76
parent 44deaac9a340127b966cd745f5372799bfaa26d1
author TreeHugger Robot <treehugger-gerrit@google.com> 1501695990 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1501695990 +0000

Merge changes from topic 'am-916774c2-9e43-4da0-a288-183ea416defb' into ub-launcher3-master

* changes:
  [automerger] Updating fade-effect parameters: > Shifting the effect at the edge in the presence of padding > Removing fade effect at the bottom > Fixing wrong call for translating children am: 5d80c28161
  Updating fade-effect parameters: > Shifting the effect at the edge in the presence of padding > Removing fade effect at the bottom > Fixing wrong call for translating children