tree ff880cafbf3630777a5cdf11f1a8ce1fc9e60e9a
parent 0aebf813c2d12fbd85cf5ae64311fda18c58e4e2
parent fe0fb0e663293ba304b17f5420dcddebda818a65
author Tyler Gunn <tgunn@google.com> 1585674668 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1585674668 +0000

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

Change-Id: Icf4e7f56193e31bf00a8aa80475000399ccd7c20