Merge branch 'cm-10.1' into cm-10.1-openpdroid

Conflicts:
	src/java/com/android/internal/telephony/SMSDispatcher.java
Merge branch 'cm-10.1-openpdroid' of git://github.com/wsot/platform_frameworks_opt_telephony into cm-10.1

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