| commit | 1bbd8a6ee1ac26be693afe7a1288addc6f11535e | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Thu Nov 20 21:29:23 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 20 21:29:23 2014 +0000 |
| tree | 66324dc496566c58747e8c2bb5e20b7181666443 | |
| parent | 892d43bad6c64d81da55627d81376aff9cfd05db [diff] | |
| parent | 2fefd7acf55f5caf6a4bf564e1a25fa8e4904713 [diff] |
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.