tree 446e31542fea72da1b1d932bad3635ba996cd252
parent 43f86045f60f0a9ad4035db0fdc399835f8c1cbb
parent fe0fb0e663293ba304b17f5420dcddebda818a65
author Tyler Gunn <tgunn@google.com> 1585674657 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1585674657 +0000

Merge " Failed to show hold call when user click swap and merge simultaneously" am: 017fa0a742 am: fe0fb0e663

Change-Id: Ifeff97a2f872c5a18e37c43b8f22b51a25a650d6