tree 8409bb5ffd6e8f4d906c87aa565e5e58cea7663d
parent 4cc7f1ac89d7d8b51a9ef2e333c2530d4366687d
parent 293d964024ba2107014d98bf15cbf876f84b2107
author Winson Chung <winsonc@google.com> 1559089309 -0700
committer android-build-merger <android-build-merger@google.com> 1559089309 -0700

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

Change-Id: I2a53a5633d4d65ecc1ed2f9d78a7f18d749a82a6