tree 4980009dc8c49a00d01cb1f9e2a26c82305d5740
parent 005080e5f8c3cfd7918bb9a62e36384d6a08351e
parent d4340f89f830e9caec3230cba01dfae79580d8aa
author Tyler Gunn <tgunn@google.com> 1416455042 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416455042 +0000

am d4340f89: Merge "Change Connections to allow setting conferenceable with conferences." into lmp-mr1-dev

* commit 'd4340f89f830e9caec3230cba01dfae79580d8aa':
  Change Connections to allow setting conferenceable with conferences.