tree 3b1e44280ace7acf229ae2486f482222bef15b12
parent 908d3bea3befe552e6283d6728c10f11eb04b65e
author mike dooley <mdooley@google.com> 1424199373 -0800
committer The Android Automerger <android-build@google.com> 1424219529 -0800

Fix Cdma conference cleanup bug.

The conference pointer in the CdmaConferenceController wasn't being cleared after the
conference was destroyed.  This prevented subsequent conferences from being created
correctly (ie. couldn't merge calls into a new conference).

Bug: 19355781, 18612712
Change-Id: I0612d7e2f89cdb56ed330289d08ee4e7ef007970