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

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

Change-Id: I92e8632407e38cd83db81a2ef7a4d85cea3934f6