am 8f1e1f21: am 61922585: Merge "Add docs to Conference object." into lmp-dev
am 8f1e1f21: am 61922585: Merge "Add docs to Conference object." into lmp-dev

* commit '8f1e1f21285a4590fdc236d4a0803602909a5067':
  Add docs to Conference object.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base