| commit | 55def57bd3a6b66922eaa9a689b93512defbfa3b | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Tue Apr 28 14:52:01 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 28 14:52:01 2015 +0000 |
| tree | 2bf16599f8e369cd445cfe8b1d5c7a392a66486b | |
| parent | 2ae8ce9e4ecf5b2b6e58f3c420a85c87bd8682d3 [diff] | |
| parent | 54a49d80c2aa3666aa865154447e53864afc3974 [diff] |
am 64da7ff5: am b8ea399e: DO NOT MERGE Fix missing "manage conference" option. * commit '64da7ff55a578c8ea7033144fed3977d93b72cb9': DO NOT MERGE Fix missing "manage conference" option.