Merge remote-tracking branch 'aokp/jb-mr2' into HEAD

Conflicts:
	src/com/android/phone/CallNotifier.java
	src/com/android/phone/MobileNetworkSettings.java

Change-Id: I09e0fb40fbdfee6c82fe8b93164a9beb1478e148