tree a3221d4b3c4e59aab51a25836e09436c72987a83
parent dc0f028f10f14394e4c059b86ac23f27b95f4514
parent 045b6c98c38edd8312668d2ea2a4bfd583a4b8fa
author Tyler Gunn <tgunn@google.com> 1416455043 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416455043 +0000

am 045b6c98: Create IMSConference to represent IMS conference calls.

* commit '045b6c98c38edd8312668d2ea2a4bfd583a4b8fa':
  Create IMSConference to represent IMS conference calls.