| commit | fab76dca055374c2591629eb2135f9c711e11dcc | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Mon Oct 06 15:22:35 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 06 15:22:35 2014 +0000 |
| tree | e85e041c88b2349f09a9ea4255982c15b9964142 | |
| parent | 3f80f434af717068c638975c600712295beb309a [diff] | |
| parent | b7295ae535247d41372c083fa8c8ab04edacac3b [diff] |
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.