Merge "Remove migrated config_carrier_wfc_ims_available"

author Jordan Liu <jminjie@google.com>

Thu, 29 Sep 2016 22:57:28 +0000 (22:57 +0000)

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

Thu, 29 Sep 2016 22:57:28 +0000 (22:57 +0000)
author Jordan Liu <jminjie@google.com>
Thu, 29 Sep 2016 22:57:28 +0000 (22:57 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 29 Sep 2016 22:57:28 +0000 (22:57 +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>
	Thu, 29 Sep 2016 22:57:28 +0000 (22:57 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 29 Sep 2016 22:57:28 +0000 (22:57 +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