| commit | 2fefd7acf55f5caf6a4bf564e1a25fa8e4904713 | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Thu Nov 20 21:20:30 2014 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Nov 20 21:20:30 2014 +0000 |
| tree | ef26705eb82a58dff9c4b68789f56c36b3e23d97 | |
| parent | 1e910d17cef3ef21c09ead282b829ab7bb7bdedb [diff] | |
| parent | ce5a8e861d16814e1d452f4512f05b258b95de1d [diff] |
am d4340f89: Merge "Change Connections to allow setting conferenceable with conferences." into lmp-mr1-dev automerge: ce5a8e8 * commit 'ce5a8e861d16814e1d452f4512f05b258b95de1d': Change Connections to allow setting conferenceable with conferences.