Revert "fix derp2"

This reverts commit 025c239b5fd41a350d7416bc17ac053a9736774e.

	modified:   src/com/android/phone/MobileNetworkSettings.java
Revert "fix derp"

This reverts commit 29853b45829981f94abc20ce28ae8c527351dff7.
Revert "Fix up. thanks |0xd34D|"

This reverts commit 0a7628f7fc12af1055cf941795e1c569294d2332.

	modified:   res/values/strings.xml
Revert "Merge remote-tracking branch 'upstream/master' into jellybean"

This reverts commit 19b58d2b33da95e572efd3a0d9dec1764339b646, reversing
changes made to 8218e2bd90c54e917089cac2787da1cef1c0f22f.

	modified:   res/values/strings.xml
	modified:   src/com/android/phone/InCallTouchUi.java
	modified:   src/com/android/phone/MobileNetworkSettings.java
	modified:   src/com/android/phone/NetworkSetting.java
	modified:   src/com/android/phone/PhoneUtils.java