tree 83c998d92b959ece9b90d3dd2c23a24069b7bf7c
parent 76dc5e64b779a0e709c22d5c97950326ad505dee
author Etan Cohen <etancohen@google.com> 1407544905 -0700
committer The Android Automerger <android-build@google.com> 1409098554 -0700

Conference calling for IMS: add code to delegate from parent GSM/CDMA phone.

Bug: 17221493
Change-Id: I261922349cb0574a0b726e831bc5205bb2b37019