| commit | 19cbe699b6a43fa4139929a9b9b5d3d7ec592c8a | [log] [tgz] |
|---|---|---|
| author | Santos Cordon <santoscordon@google.com> | Mon Nov 10 18:02:45 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 10 18:02:45 2014 +0000 |
| tree | d322d672d33d8ae584d99dde50619bc3f68039d6 | |
| parent | 49cca372b1c23b27029d6eaa2911ef43ed7e8131 [diff] | |
| parent | de57ce8167f7c08f9dccefa976cd12155dfd85b8 [diff] |
am de57ce81: Merge "Calculate conferenceable after conference." into lmp-mr1-dev * commit 'de57ce8167f7c08f9dccefa976cd12155dfd85b8': Calculate conferenceable after conference.