Merge remote-tracking branch 'google/jb-mr1.1-release' into jb2

Conflicts:
	src/java/com/android/internal/telephony/CallManager.java
Merge branch 'jb2' of git://github.com/CarbonDev/android_frameworks_opt_telephony into jb2

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