tree a26be7d4194b9077642bfe565b6d5fc4d324916a
parent dc9a1266ee9132030d8bbba9cc9845a4d30d9351
parent 0727d59576f2f5b856a2234b7a6b7b8502a1e4a4
author Winson Chung <winsonc@google.com> 1563928154 -0700
committer android-build-merger <android-build-merger@google.com> 1563928154 -0700

Merge "Fix regression in assistant window handling" into ub-launcher3-qt-r1-dev
am: 0727d59576

Change-Id: I9fbde5b101705ad9254a6ba668ff079a4f15c41f