am bc067325: Merge "Send empty flash for some CDMA carriers for 3way call" into lmp-dev

author Vineeta Srivastava <vsrivastava@google.com>

Thu, 11 Sep 2014 17:51:38 +0000 (17:51 +0000)

committer Android Git Automerger <android-git-automerger@android.com>

Thu, 11 Sep 2014 17:51:38 +0000 (17:51 +0000)
author Vineeta Srivastava <vsrivastava@google.com>
Thu, 11 Sep 2014 17:51:38 +0000 (17:51 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Thu, 11 Sep 2014 17:51:38 +0000 (17:51 +0000)
diff --cc core/res/res/values/config.xml
Simple merge
diff --cc core/res/res/values/symbols.xml
Simple merge
author	Vineeta Srivastava <vsrivastava@google.com>
	Thu, 11 Sep 2014 17:51:38 +0000 (17:51 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Thu, 11 Sep 2014 17:51:38 +0000 (17:51 +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