tree 0f1e561673a5942b8c7d5922c5584ad7b799e198
parent d52131dbe99f23838a0f24b7d0b3f4b4cafadf0d
parent 4819634a0d65527aa921597d00b1604b44913b49
author Yorke Lee <yorkelee@google.com> 1410929076 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410929076 +0000

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

* commit '5d454fcd11f3c931d3cf77337dd573ebf8515d1b':
  Add missing methods to Conference object