Complete implementation of ImsCallSession merge()

This CL implements the rest of the logic around the various callbacks
that are issued from the ImsCallSession to implement the merging of
two calls into a conference.

Bug: 18056632
Change-Id: I183a3b2c49d4192e14813333339440d746febdbf
1 file changed
tree: 93cdb47ebac157d52799d5f46e2e1158bc1c52e1
  1. Android.mk
  2. CleanSpec.mk
  3. README.txt
  4. src/