tree c1d87a55443b6b11557349462bd42561bfd856c8
parent 4aa0a6ca7cb1d3996b2e5e33ca9ef31ffa04d60b
parent f1ce0f31ab45521d6d5175891e012807c4ad6d6b
author Jon Miranda <jonmiranda@google.com> 1568692120 -0700
committer android-build-merger <android-build-merger@google.com> 1568692120 -0700

[automerger skipped] Fix failing test testPromiseIcon_addedFromEligibleSession. am: d6ae55d968
am: f1ce0f31ab -s ours
am skip reason: SHA1 f1ce0f31ab skipped by user jonmiranda

Change-Id: I5bfc823c2e73b0278bf1cee0292f12581e85df36