Merge remote-tracking branch 'aosp/jb-mr1.1-release' into HEAD
Some changes added to compile and run with Java 6 and Java 7.

  - correction of errors with Javac 7:
    - creation of empty classes.

Change-Id: I5d93330d6304937bf8f31f685046d1041549603a

Conflicts:
	src/java/com/android/internal/telephony/gsm/GSMPhone.java
frameworks telephony - add DCHSPAP value

Change-Id: Ic68579da84f25be0a824d7632ce9632b9ae66944

Depends on: http://review.cyanogenmod.org/#/c/35439/
Add SMS Middleware layer.

Change-Id: I4fff0c584f8fce9c5f2f4fe86a82fe6480c307c7
Refactor SMS Middleware and SMS Send path.

Introduce a new Broadcast, ACTION_NEW_OUTGOING_SMS, that is similar to the existing call
equivalent ACTION_NEW_OUTGOING_CALL. This allows a receiver to rewrite the intent
or cancel it entirely.

This removes the need for injecting middleware.

Change-Id: I063288461161979f951932f32ade2cfbd72f8b73
SMS Broadcast result receiver fix:
Fix bug where sentIntents is pulled from the wrong bundle key.

Change-Id: I306be0aeeda07e065702ca30edc3818ae9be4e26
Merge branch 'jellybean' of github.com:ParanoidAndroid/android_frameworks_opt_telephony into jellybean