| commit | d97f5344fa8e57dd53943a279acfcb22fbfa7bd6 | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Mon Apr 27 17:29:48 2015 +0000 |
| committer | Android Partner Code Review <android-gerrit-partner@google.com> | Mon Apr 27 17:32:10 2015 +0000 |
| tree | 5ab6f1e9a73d3d785bde0f6ca00a971908d43f19 | |
| parent | 7c4d3f9c15b73ac5b89f62b438cdec4ff67b208c [diff] | |
| parent | 6815f2e4cbde48ba97dc8e67534109fb7f62283e [diff] |
Merge "DO NOT MERGE Fix missing "manage conference" option." into m-wireless-dev