tree 85c8ccda94dcc73c475110b27afabcd1edaa364f
parent b2919a80e75fd899ec071509f1eb3de1f7e49193
parent 746aefe4fbf38213750b4383fab0e79e222bed47
author Jon Miranda <jonmiranda@google.com> 1557940634 -0700
committer android-build-merger <android-build-merger@google.com> 1557940634 -0700

Merge "Fade in badges on top of icons after swipe up animation." into ub-launcher3-qt-dev
am: 746aefe4fb

Change-Id: I4a2030b94c698883b55eca2c37cc84e4081ea6b2