tree b66c3037cfa10834042ce4725dd5ef179591da01
parent 87c8a511cd4f38f4752a7882fbb4abc7206cefb6
parent ff9fe09b3f6cdf3a5046e22f8bcf30e99890f4c2
author Winson Chung <winsonc@google.com> 1559759572 -0700
committer android-build-merger <android-build-merger@google.com> 1559759572 -0700

Merge "Use device locked input consumer when an activity is showing when locked" into ub-launcher3-qt-dev
am: ff9fe09b3f

Change-Id: Ife915a7d822a865da477979bb3ca290949843c69