| commit | d4340f89f830e9caec3230cba01dfae79580d8aa | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Thu Nov 20 03:40:08 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Nov 20 03:40:10 2014 +0000 |
| tree | f716b4323cbbb87739eb89416b2b24870cb08fe8 | |
| parent | 70273e05b26f671dcec9ff1aa4bafabb5e407895 [diff] | |
| parent | 6d76ca0438c2cb7a7d5d91992db819c063c0a57b [diff] |
Merge "Change Connections to allow setting conferenceable with conferences." into lmp-mr1-dev