tree 0315d8dfb944673127013b232983d1d171fc568f
parent 5cb4990ffe1182aa6238a0b18a648fcbc219864d
parent dfbb964dcc44dec89f6c64801f60fdcb93c9e5de
author Winson Chung <winsonc@google.com> 1560534321 -0700
committer android-build-merger <android-build-merger@google.com> 1560534321 -0700

Merge "Always use the locked input consumer when showing activity over lockscreen" into ub-launcher3-qt-dev
am: dfbb964dcc

Change-Id: Id7595b63dabd3a6f295a7fadc81bebcbb70a7ea4