Merge remote-tracking branch 'cm/cm-10.2' into HEAD

Conflicts:
	src/java/com/android/internal/telephony/CallManager.java
	src/java/com/android/internal/telephony/SMSDispatcher.java

Change-Id: I74ad1173b544749cdbdfe237e370061ab37576ee