Add cdma_3waycall_flash_delay key to CarrierConfig am: e5535d71fc

author Jordan Liu <jminjie@google.com>

Fri, 14 Oct 2016 14:15:26 +0000 (14:15 +0000)

committer android-build-merger <android-build-merger@google.com>

Fri, 14 Oct 2016 14:15:26 +0000 (14:15 +0000)
author Jordan Liu <jminjie@google.com>
Fri, 14 Oct 2016 14:15:26 +0000 (14:15 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 14 Oct 2016 14:15:26 +0000 (14:15 +0000)
diff --cc core/res/res/values/config.xml
Simple merge
diff --cc core/res/res/values/symbols.xml
Simple merge
author	Jordan Liu <jminjie@google.com>
	Fri, 14 Oct 2016 14:15:26 +0000 (14:15 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 14 Oct 2016 14:15:26 +0000 (14:15 +0000)
		1	2
core/res/res/values/config.xml	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/symbols.xml	patch \|	diff1 \|	diff2 \|	blob \| history