tree 2ba87cb2a35f48d16d740dd4e4735c66d105831c
parent 0dfda02ec30ee155fd26af0a5d390c504807e0eb
parent 017c6f2daaed2c5f0301587ba88663f73b76ecb1
author Andrew Lee <anwlee@google.com> 1413925956 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413925956 +0000

am 017c6f2d: Merge "Fire onConferenceChanged after reseting conference." into lmp-mr1-dev

* commit '017c6f2daaed2c5f0301587ba88663f73b76ecb1':
  Fire onConferenceChanged after reseting conference.