| commit | cadeba012c0cc5892bafcc6b4a16deaa5bce7193 | [log] [tgz] |
|---|---|---|
| author | Anthony Lee <anthonylee@google.com> | Tue Nov 18 05:00:25 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Nov 18 05:00:25 2014 +0000 |
| tree | 5e106c2f5382fdd8eacc1b84f366d53ebcde3ab9 | |
| parent | 60417173eb589601fc1bb5926e5cb37276e964cb [diff] | |
| parent | e946853593443c23aec0b4763a27c7f098d4e3ee [diff] |
Merge "Add code to show a message when a conference merge fails." into lmp-mr1-dev