Bug 896920 - B2G Emulator: support conference call. r=vicamo
Merge pull request #26 from hsinyi/bugzilla/896920/master

Bug 896920 - B2G Emulator: support conference call. r=vicamo
Merge remote-tracking branch 'b2g/master' into b2g-jellybean