Merge "Revert "Add config resource to help ATT prepaid"" into jb-mr1-dev
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 4698002..26d04e9 100755
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -988,9 +988,4 @@
<!-- Whether camera shutter sound is forced or not (country specific). -->
<bool name="config_camera_sound_forced">false</bool>
- <!-- Set to true if we need to not prefer an APN.
- This is being added to enable a simple scenario of pre-paid
- provisioning on some carriers, working around a bug (7305641)
- where if the preferred is used we don't try the others. -->
- <bool name="config_dontPreferApn">false</bool>
</resources>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index c48de1f..fae63db 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -276,7 +276,6 @@
<java-symbol type="bool" name="config_useDevInputEventForAudioJack" />
<java-symbol type="bool" name="config_safe_media_volume_enabled" />
<java-symbol type="bool" name="config_camera_sound_forced" />
- <java-symbol type="bool" name="config_dontPreferApn" />
<java-symbol type="integer" name="config_cursorWindowSize" />
<java-symbol type="integer" name="config_longPressOnPowerBehavior" />