tree afb839886ab3ccbdf60e6a750607bc56effb80df
parent 323033693cfe7fd97a724f5879becc8d8d62c6da
parent cadeba012c0cc5892bafcc6b4a16deaa5bce7193
author Anthony Lee <anthonylee@google.com> 1416287294 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416287294 +0000

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.