tree 7f54d863cdb834081b75789d2baeb4d207dcf57d
parent ec0cf5eb153c5705f34d697e2b337d231b430396
parent 99542f23d0f5d97f197a9ac5e6b5de5340c91fa2
author Brad Ebinger <breadley@google.com> 1573859576 -0800
committer android-build-merger <android-build-merger@google.com> 1573859576 -0800

Merge "Fix condition where an incoming CDMA call hung up emergency call" am: 1bbc2b6e81
am: 99542f23d0

Change-Id: Ia0ab361221ba37a3c24844e3acb926346b318769