tree ff9a61a2deae335a415cd9562d332732f529dfcc
parent ddd0ff44ba0424427e68016dc676ba006d4f70b0
parent 32c8664fb4d853567c638eea3e68ae2e6e66aef3
author Jonathan Miranda <jonmiranda@google.com> 1569000159 -0700
committer android-build-merger <android-build-merger@google.com> 1569000159 -0700

[automerger skipped] Merge "[DO NOT MERGE] Fixed a bug where restored promise icons stay promise icons." into ub-launcher3-qt-qpr1-dev
am: 32c8664fb4 -s ours
am skip reason: subject contains skip directive

Change-Id: Id460f46bbbe82cfe2754219812d3681b56654864