tree ff880cafbf3630777a5cdf11f1a8ce1fc9e60e9a
parent ec330629956cc7e11dbd654e8963c9793f6b4a50
parent 017fa0a7420986708835f3ce7f2e87df233065d4
author Tyler Gunn <tgunn@google.com> 1585673781 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1585673781 +0000

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

Change-Id: Ic0bca4dbb981c267da4986a9790ac594c6a7201a