| commit | 19a71903d6ae43d1648937f4afd6014b71bc0a2a | [log] [tgz] |
|---|---|---|
| author | Santos Cordon <santoscordon@google.com> | Mon Jun 02 17:26:36 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 02 17:26:36 2014 +0000 |
| tree | ad036857d4cbab5d8399007913d30880ba59464b | |
| parent | 787748f92ac52b1060c2f3c392b0254fe6030c72 [diff] | |
| parent | 433351eeea1dd4907605eb018e030527321c12dd [diff] |
am 433351ee: Merge "Method definitions for conference APIS." into lmp-preview-dev * commit '433351eeea1dd4907605eb018e030527321c12dd': Method definitions for conference APIS.