tree 06dc7d3990f804df38fe322510614c99b2a033a2
parent 977726f7a120d7862a2e37bdb34c6cdcaf17161b
parent 912206c17d2ef3402db1f01aabfe36c1bf8e9f2a
author Jonathan Miranda <jonmiranda@google.com> 1569000521 -0700
committer android-build-merger <android-build-merger@google.com> 1569000521 -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: 912206c17d -s ours
am skip reason: subject contains skip directive

Change-Id: I9c27523a9e934757c75cde5eda5e267bd9478b6c