tree 7ba1b2b00afd11070a47c238675ecc505332c2a4
parent 73fe1489812922e6b9583eeb080e20b420aa4d7a
author Anthony Lee <anthonylee@google.com> 1423703075 -0800
committer The Android Automerger <android-build@google.com> 1424219524 -0800

Cleanup of conference code including logging, flags and some workflow.

The main purpose was to simply the logic so that the code is more
explicit about what it is doing. There was also a bug in the hold and
resume flow that was fixed.

Bug: 19294176
Change-Id: I558d6da919b9d763f1fd2413e8f9a3dfa5d0e4be