IMS call merge call-back changes.
authorTyler Gunn <tgunn@google.com>
Fri, 24 Oct 2014 17:02:19 +0000 (10:02 -0700)
committerTyler Gunn <tgunn@google.com>
Fri, 24 Oct 2014 17:02:19 +0000 (10:02 -0700)
commit3f2b0aaa277545886571cbf90fc90fd5d304e714
treef82636abe9ff62da350071848d192520bf7ec543
parent650762a1678463336e9f7540e117e3856bed881c
IMS call merge call-back changes.

Renaming callSessionMerged to callSessionMergeStarted.
Adding callSessionMergeComplete callback for when merge successfully
completes.

Bug: 18056632
Change-Id: Id560965722f8651646e6ed5ec158747d1cb5e210
src/java/com/android/ims/ImsCall.java
src/java/com/android/ims/internal/ImsCallSession.java