tree d9aff1cb41a1135f0247c7956d287dd862115ffb
parent e59a45f3aee981672daaf18f1cfabfa8452149b3
parent b7dc3a3b21217c752cdffcdaa0a788cacb2861bd
author Brad Ebinger <breadley@google.com> 1507262069 +0000
committer android-build-merger <android-build-merger@google.com> 1507262069 +0000

Merge "Fix NPE when removing PIN locked SIM during E911 call"
am: b7dc3a3b21

Change-Id: I16555b53bbf9c743921cbd36578af3550705a242