am 7461b5a0: Merge "Adding support for Cdma conference calling." into lmp-dev
am 7461b5a0: Merge "Adding support for Cdma conference calling." into lmp-dev

* commit '7461b5a019dca6e02f1ddba0f75a6548e40fb632':
  Adding support for Cdma conference calling.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base