mokee phoneloc

Change-Id: Id5be9ec98200082611bb3562bae67c4f84b328db

Conflicts:
	src/com/android/phone/CallCard.java
Phone :null point bug fix

Change-Id: I6416ef3e1c23d99dd597210bafb9eab716a84192
remove unused parameter

Change-Id: Ia77edabf87fbb6813c0daf2e6660a1c1973e2102