tree b7830952542db233e0113d6857ebdb35a2f51d0a
parent 6a3a09940fe48a9d62abb453b9e8558e0da06327
parent bdf1687f57de361b1345bf6547cab22e1cc4623c
author Andy Wickham <awickham@google.com> 1571098151 -0700
committer android-build-merger <android-build-merger@google.com> 1571098151 -0700

[automerger skipped] Merge "Fades out Assistant when entering Overview." into ub-launcher3-qt-future-dev
am: bdf1687f57 -s ours
am skip reason: change_id Ia53c2407c82725c776f27b0d6e80a34554b4a303 with SHA1 68e01dda46 is in history

Change-Id: If01f0ac2dd97e86d647520af80996372ee982371