am 14cb7b8a: Add config to control phone switch

author Sukanya Rajkhowa <srajkh@codeaurora.org>

Thu, 25 Sep 2014 16:23:11 +0000 (16:23 +0000)

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

Thu, 25 Sep 2014 16:23:11 +0000 (16:23 +0000)
author Sukanya Rajkhowa <srajkh@codeaurora.org>
Thu, 25 Sep 2014 16:23:11 +0000 (16:23 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Thu, 25 Sep 2014 16:23:11 +0000 (16:23 +0000)
diff --cc core/res/res/values/config.xml
Simple merge
diff --cc core/res/res/values/symbols.xml
Simple merge
author	Sukanya Rajkhowa <srajkh@codeaurora.org>
	Thu, 25 Sep 2014 16:23:11 +0000 (16:23 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Thu, 25 Sep 2014 16:23:11 +0000 (16:23 +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