| commit | c74030a76bca3c731b1be82d47563a678844efda | [log] [tgz] |
|---|---|---|
| author | Santos Cordon <santoscordon@google.com> | Mon Nov 10 18:06:35 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 10 18:06:35 2014 +0000 |
| tree | 67b6a71bf4f74113d5bfc19ae1b129b465f8983e | |
| parent | 1baa9e0d4d4a9155b7468ef453022d6119200a06 [diff] | |
| parent | 19cbe699b6a43fa4139929a9b9b5d3d7ec592c8a [diff] |
am 19cbe699: am de57ce81: Merge "Calculate conferenceable after conference." into lmp-mr1-dev * commit '19cbe699b6a43fa4139929a9b9b5d3d7ec592c8a': Calculate conferenceable after conference.