Commits
Tyler Gunn authored and Android Git Automerger committed 1bbd8a6ee1aM
am 2fefd7ac: am d4340f89: Merge "Change Connections to allow setting conferenceable with conferences." into lmp-mr1-dev automerge: ce5a8e8 * commit '2fefd7acf55f5caf6a4bf564e1a25fa8e4904713': Change Connections to allow setting conferenceable with conferences.
Showing diff to2fefd7acf55