tree 6027aee7c908187eccd70e312fa2290cab8d5530
parent a0b026a6ed3020cb1847a02c62bf6a1baa3ae687
parent 0c7b01a69495a7f495aa4dee0419e0bb46040e2d
author Jon Miranda <jonmiranda@google.com> 1571959683 -0700
committer android-build-merger <android-build-merger@google.com> 1571959683 -0700

[automerger skipped] Merge "Add support for work profile promise icons." into ub-launcher3-qt-future-dev
am: 0c7b01a694 -s ours
am skip reason: change_id I2db2d8da449c37eb248a59fbc9e7b517f50855c1 with SHA1 26256f79c3 is in history

Change-Id: Ib0d084e18a3d4890828d482baa5e0d4f2e5a73ff