tree b9115d0b696e02b22f7581e0b9dad7b3007ef3d2
parent d69cc64d4474c4fd8e8f1845e7aa3951647e3f44
parent 1c4eb10cc1159d5e029f982a629c5262419fa5ce
author Yorke Lee <yorkelee@google.com> 1410928366 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410928366 +0000

am 44b693a3: Merge "Add missing methods to Conference object" into lmp-dev

* commit '44b693a3cdee9908223723e961a29fbfc0305163':
  Add missing methods to Conference object