| commit | b0dd379a593dc7a4178d3f35585c0712e4e4cb7b | [log] [tgz] |
|---|---|---|
| author | Anthony Lee <anthonylee@google.com> | Tue Nov 18 20:19:55 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 18 20:19:55 2014 +0000 |
| tree | 5e106c2f5382fdd8eacc1b84f366d53ebcde3ab9 | |
| parent | 85fcd602b3af36c716e513e342c2a31e1a218924 [diff] | |
| parent | c0b41cd25450f7b705d562dfb704bb680696afe7 [diff] |
am c0b41cd2: am cadeba01: Merge "Add code to show a message when a conference merge fails." into lmp-mr1-dev * commit 'c0b41cd25450f7b705d562dfb704bb680696afe7': Add code to show a message when a conference merge fails.