Tyler Gunn da457b206e Merge \"Add onConferenceSupportedChanged callback, carrier config.\" into nyc-mr1-dev ...

am: 780648be53

Change-Id: I71c24e971bf8d36fd5448497b85660be43417632

2016-06-27 21:40:04 +00:00

..

android/telephony

Merge \"Add onConferenceSupportedChanged callback, carrier config.\" into nyc-mr1-dev

2016-06-27 21:40:04 +00:00

com/android

Add support for dropping fg video call on answer of audio call.

2016-06-23 12:48:43 -07:00