| commit | 54a49d80c2aa3666aa865154447e53864afc3974 | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Mon Apr 27 21:05:31 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 27 21:05:31 2015 +0000 |
| tree | 2bf16599f8e369cd445cfe8b1d5c7a392a66486b | |
| parent | 1a0b95c4b57ed9976bdcb9aae4d1c321381312bb [diff] | |
| parent | 7b10cf5e1c07c480cf31663ad75cec4854fb3c75 [diff] |
am b8ea399e: DO NOT MERGE Fix missing "manage conference" option. * commit 'b8ea399e0a2448e8fdc64d91aaaea182d76f39ad': DO NOT MERGE Fix missing "manage conference" option.