Hall Liu 2258e483f1 Merge \"Add disable add call during video call extra and carrier config key\" into nyc-mr1-dev ...

am: 2cd8281a23

Change-Id: I98ed6adcc49525db82c09a98e2c632894a4a0bc9

2016-06-28 02:34:00 +00:00

..

android/telephony

Merge \"Add disable add call during video call extra and carrier config key\" into nyc-mr1-dev

2016-06-28 02:34:00 +00:00

com/android

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

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