| commit | c0b41cd25450f7b705d562dfb704bb680696afe7 | [log] [tgz] |
|---|---|---|
| author | Anthony Lee <anthonylee@google.com> | Tue Nov 18 05:08:14 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 18 05:08:14 2014 +0000 |
| tree | afb839886ab3ccbdf60e6a750607bc56effb80df | |
| parent | 323033693cfe7fd97a724f5879becc8d8d62c6da [diff] | |
| parent | cadeba012c0cc5892bafcc6b4a16deaa5bce7193 [diff] |
am cadeba01: Merge "Add code to show a message when a conference merge fails." into lmp-mr1-dev * commit 'cadeba012c0cc5892bafcc6b4a16deaa5bce7193': Add code to show a message when a conference merge fails.