tree bbf92c0bb867e75eb2365fb1d95038e1112bf305
parent ceff588a00176fa39c4e30ccc6026146215887fb
parent def865a6451d5e3678ff1845d1a7a91ea89fd2bb
author Winson Chung <winsonc@google.com> 1559089610 -0700
committer android-build-merger <android-build-merger@google.com> 1559089610 -0700

Merge "Support individual lock task features" into ub-launcher3-qt-dev am: 293d964024
am: def865a645

Change-Id: I0bcee1d1f62c580f5c77e609154be1f24fd1c4bb