tree 9b84668a0a7d4405203a7b9c0a2f6574515cd19f
parent 29fbce35a65ba1f2a63f0ceca98e4c6f31b5267e
parent 2e3eb7c90b6e17217e1289adeffb04e4218740eb
author Yorke Lee <yorkelee@google.com> 1380228456 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380228456 -0700

am 8a07fbec: am 6519346a: Fix potential NPE in ConferenceManagerPresenter

* commit '8a07fbecb3f06abe88d065df8631e062be1f31ae':
  Fix potential NPE in ConferenceManagerPresenter