Jordan Liu e787323e03 fix branch break by adding carrierconfig key ...

Add KEY_CDMA_3WAYCALL_FLASH_DELAY_INT and default value to
CarrierConfigManager

Bug: 29873049
Change-Id: I53dc93defbfa7d1366e6ee066638d73df03f88d0

2016-09-29 15:25:46 -07:00

..

android/telephony

fix branch break by adding carrierconfig key

2016-09-29 15:25:46 -07:00

com/android

Merge "OMADM intent sent by both system and apps." into nyc-dev

2016-05-17 17:41:11 +00:00