Merge branch 'jb_mr2' of git://codeaurora.org/platform/packages/apps/Phone into qcril

Change-Id: I791e8e51ec2f918a1d22497bb10a71439fe11b45

Conflicts:

	src/com/android/phone/PhoneInterfaceManager.java