Phone: Location Support (1/2)

Change-Id: I39897c3ad657c47221f7fa304d4d01022a28278b

Conflicts:
	src/com/android/phone/CallCard.java
Phone: Only show location when language is Chinese

Change-Id: I96f5792b604474f9576a2fd6b5de01a6c644ed10
CDMA: Data connection bug fixes (4/4)

Change-Id: I3c30d7df42d76352dfa6fda88b7fc255124047dd
Phone: add PhoneLocation.java to static library for other packages to use
Phone: update Chinese translations
Phone: update Chinese translations
Phone: update more translations
IPCall support

Change-Id: I0741337326c2141f98c25e34f86a4de23d64408f

Conflicts:
	res/values-zh-rCN/strings.xml
	res/values/strings.xml
Phone: Direct Call support. (1/3)

Change-Id: If3e637bee12c6fee3f7bab4c2b480754f6a40d22

Conflicts:
	res/values-zh-rCN/strings.xml
	res/values/strings.xml
	src/com/android/phone/CallFeaturesSetting.java
Phone: support writing the phone apps status to proximity sysfs node

Change-Id: I40f75cc610a206711433c661ad2595ead2166c46

Conflicts:
	res/values/cm_arrays.xml
	res/values/config.xml
Phone: fix error packagename

Change-Id: I4cdb422da23a4648bc45a6d00236dabdda65d8fe