tree e85e041c88b2349f09a9ea4255982c15b9964142
parent 3f80f434af717068c638975c600712295beb309a
parent b7295ae535247d41372c083fa8c8ab04edacac3b
author Tyler Gunn <tgunn@google.com> 1412608955 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412608955 +0000

am b7295ae5: Merge "Fixing where calls disconnected from conference manager are still shown." into lmp-dev

* commit 'b7295ae535247d41372c083fa8c8ab04edacac3b':
  Fixing where calls disconnected from conference manager are still shown.